Revert to simpler keyserver checking policy in proxy-command.

diff --git a/src/monkeysphere-ssh-proxycommand b/src/monkeysphere-ssh-proxycommand
index f4d4b0d9affb8835ae812e22c9fa58f5388c3fbf..6dcb723e244a6d32d5f114dc02a6f336fcae2a58 100755 (executable)
--- a/src/monkeysphere-ssh-proxycommand
+++ b/src/monkeysphere-ssh-proxycommand
@@ -31,6 +31,8 @@ fi
 HOST="$1"
 PORT="$2"
 
+MS_HOME=${MS_HOME:-"${HOME}/.config/monkeysphere"}
+
 if [ -z "$HOST" ] ; then
     log "host must be specified."
     usage
@@ -58,11 +60,12 @@ else
     # FIXME: this only works for default known_hosts location
     hostKey=$(ssh-keygen -F "$HOST")
     if [ "$hostKey" ] ; then
-       # if the check keyserver variable is NOT set to true...
-       if  [ "$CHECK_KEYSERVER" != 'true' ] ; then
-           # schedule a keyserver check for host at a later time
-           echo "monkeysphere update-known_hosts $HOST" | at noon
-       fi
+       # do not check the keyserver
+       # FIXME: more nuanced checking should be done here to properly
+       # take into consideration hosts that join monkeysphere by
+       # converting an existing and known ssh key
+       CHECK_KEYSERVER="false"
+
     # if the host key is not found in the known_hosts file...
     else
        # check the keyserver