keys-for-userid now respects MONKEYSPHERE_CHECK_KEYSERVER (Closes: MS #1997); finesse description of CHECK_KEYSERVER in monkeysphere.conf (see: MS #2014)

3 files changed, 7 insertions, 4 deletions

diff --git a/changelog b/changelog
index cba8b4e..e29cbaf 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,8 @@ monkeysphere (0.29~pre1) UNRELEASED; urgency=low
   * Fix man page typo about monkeysphere authorized_keys location
   * Monkeysphere should work properly even if the user has "armor" in
     their gpg.conf (closes MS #1625)
+  * monkeysphere keys-for-userid now respects MONKEYSPHERE_CHECK_KEYSERVER
+    environment variable (and defaults to true)
 
  -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Thu, 18 Feb 2010 12:38:43 -0500
 
diff --git a/etc/monkeysphere.conf b/etc/monkeysphere.conf
index bcda433..ce6e82a 100644
--- a/etc/monkeysphere.conf
+++ b/etc/monkeysphere.conf
@@ -23,10 +23,10 @@
 # interaction, including all ssh connections if you use the
 # monkeysphere ssh-proxycommand.  Leave unset for default behavior
 # (see KEYSERVER CHECKING in monkeysphere(1)), or set to true or false.
-# NOTE: setting CHECK_KEYSERVER to true will leak information about
-# the timing and frequency of your ssh connections to the maintainer
-# of the keyserver.
-#CHECK_KEYSERVER=
+# NOTE: setting CHECK_KEYSERVER explicitly to true will leak
+# information about the timing and frequency of your ssh connections
+# to the maintainer of the keyserver.
+#CHECK_KEYSERVER=true
 
 # The path to the SSH known_hosts file.
 #KNOWN_HOSTS=~/.ssh/known_hosts
diff --git a/src/monkeysphere b/src/monkeysphere
index 7c92852..a763151 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -276,6 +276,7 @@ case $COMMAND in
 	;;
 
     'keys-for-userid'|'u')
+	CHECK_KEYSERVER=${MONKEYSPHERE_CHECK_KEYSERVER:=${CHECK_KEYSERVER:="true"}}
 	keys_for_userid "$@"
 	;;