default HASH_KNOWN_HOSTS to false (closes MS #2483)

diff --git a/Changelog b/Changelog
index 3c0219b512d9d967169005dbabe3a4eeb2bb695b..87d22fcd7a317ce811cdcaee5f5507ba21c8dbe1 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,10 @@
+monkeysphere (0.33~pre1) unstable; urgency=low
+
+  * defaulting MONKEYSPHERE_HASH_KNOWN_HOSTS to false
+    (closes MS #2483)
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Fri, 08 Oct 2010 16:14:53 -0400
+
 monkeysphere (0.32) unstable; urgency=low
 
   [ Jameson Rollins ]
@@ -12,7 +19,7 @@ monkeysphere (0.32) unstable; urgency=low
   * fix monkeysphere-host revoke-key, which never worked properly :(
   * add some debug output to monkeysphere-host publish-key
     (closes MS #2289)
-  
+
   [ Clint Adams ]
   * add support for options to the authorized User IDs file.  Options that
     should apply to keys for a given User ID should be on

diff --git a/etc/monkeysphere.conf b/etc/monkeysphere.conf
index ce6e82a5dd46df97fb05731b04bb03b8e0fed2d7..9732dc69fc7b6d4fbdf5750afd6c901eda12195b 100644 (file)
--- a/etc/monkeysphere.conf
+++ b/etc/monkeysphere.conf
@@ -33,7 +33,7 @@
 
 # Whether or not to hash the generated known_hosts lines.
 # Should be "true" or "false".
-#HASH_KNOWN_HOSTS=true
+#HASH_KNOWN_HOSTS=false
 
 # The path to the SSH authorized_keys file.
 #AUTHORIZED_KEYS=~/.ssh/authorized_keys

diff --git a/man/man1/monkeysphere.1 b/man/man1/monkeysphere.1
index 1f174f139976b8621cb3481babc5141b0ae4bf70..4de4076de584ff498d66de97811e90922ceadc65 100644 (file)
--- a/man/man1/monkeysphere.1
+++ b/man/man1/monkeysphere.1
@@ -165,7 +165,7 @@ MONKEYSPHERE_KNOWN_HOSTS
 Path to ssh known_hosts file. (~/.ssh/known_hosts)
 .TP
 MONKEYSPHERE_HASH_KNOWN_HOSTS
-Whether or not to hash to the known_hosts file entries. (true)
+Whether or not to hash to the known_hosts file entries. (false)
 .TP
 MONKEYSPHERE_AUTHORIZED_KEYS
 Path to ssh authorized_keys file. (~/.ssh/authorized_keys)

diff --git a/src/monkeysphere b/src/monkeysphere
index 674114a91c6ade3069cd33e81a3a43e658fd2e08..4469942c67785a5e00068f8ac7c5ac4a5b83ca1c 100755 (executable)
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -156,7 +156,7 @@ check_gpg_authentication_subkey() {
 # set unset default variables
 GNUPGHOME=${GNUPGHOME:="${HOME}/.gnupg"}
 KNOWN_HOSTS="${HOME}/.ssh/known_hosts"
-HASH_KNOWN_HOSTS="true"
+HASH_KNOWN_HOSTS="false"
 AUTHORIZED_KEYS="${HOME}/.ssh/authorized_keys"
 
 # unset the check keyserver variable, since that needs to have