summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2010-10-08 16:15:33 -0400
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2010-10-08 16:15:33 -0400
commitdbaab8b6a854c9c4e8824dde669ffabf9d58191d (patch)
tree78731d81e225bfe7aec85357a03d0dc55514c796
parent61ddc8dc17f7d8de392b0a68c961823b355de885 (diff)
default HASH_KNOWN_HOSTS to false (closes MS #2483)
-rw-r--r--Changelog9
-rw-r--r--etc/monkeysphere.conf2
-rw-r--r--man/man1/monkeysphere.12
-rwxr-xr-xsrc/monkeysphere2
4 files changed, 11 insertions, 4 deletions
diff --git a/Changelog b/Changelog
index 3c0219b..87d22fc 100644
--- 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 ce6e82a..9732dc6 100644
--- 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 1f174f1..4de4076 100644
--- 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 674114a..4469942 100755
--- 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