keys-for-userid now respects MONKEYSPHERE_CHECK_KEYSERVER (Closes: MS #1997); finesse...

diff --git a/changelog b/changelog
index cba8b4ee2fe830201e8b4b65a7a1fa08b587b433..e29cbaf65cbda1ec51d7879c6e79ff55bae0b72f 100644 (file)
--- 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 bcda43336d8d91a6f5e4ce9b7debe077332543cb..ce6e82a5dd46df97fb05731b04bb03b8e0fed2d7 100644 (file)
--- 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 7c928521e058c1c67824c9c98a674866d287e589..a763151fbdcda814dce35dfdb81982727c710207 100755 (executable)
--- 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 "$@"
        ;;