Merge branch 'master' into no-cache

[monkeysphere.git] / src / monkeysphere

diff --git a/src/monkeysphere b/src/monkeysphere
index a6ca62d7949189104cea0978e814b723b160143e..8e4c4eb7823ad57b7fdb20bbf03d48af4131a8b3 100755 (executable)
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -113,6 +113,7 @@ MS_CONF=${MS_CONF:-"${MS_HOME}/monkeysphere.conf"}
 AUTHORIZED_USER_IDS=${AUTHORIZED_USER_IDS:-"${MS_HOME}/authorized_user_ids"}
 GNUPGHOME=${GNUPGHOME:-"${HOME}/.gnupg"}
 KEYSERVER=${KEYSERVER:-"subkeys.pgp.net"}
+CHECK_KEYSERVER=${CHECK_KEYSERVER:="true"}
 REQUIRED_HOST_KEY_CAPABILITY=${REQUIRED_HOST_KEY_CAPABILITY:-"e a"}
 REQUIRED_USER_KEY_CAPABILITY=${REQUIRED_USER_KEY_CAPABILITY:-"a"}
 USER_CONTROLLED_AUTHORIZED_KEYS=${USER_CONTROLLED_AUTHORIZED_KEYS:-"${HOME}/.ssh/authorized_keys"}
@@ -147,7 +148,7 @@ case $COMMAND in
         # those hosts
        if [ "$1" ] ; then
             for host ; do
-               process_host "$host" "$hostKeysCacheDir"
+               process_host "$host"
            done
 
         # otherwise, if no hosts are specified, process every user
@@ -157,7 +158,7 @@ case $COMMAND in
                failure "known_hosts file '$USER_KNOWN_HOSTS' is empty."
            fi
            log "processing known_hosts file..."
-           process_known_hosts "$hostKeysCacheDir"
+           process_known_hosts
        fi
        ;;
 
@@ -166,7 +167,7 @@ case $COMMAND in
            failure "you must specify at least one userid."
        fi
        for userID ; do
-           update_userid "$userID" "$userKeysCacheDir"
+           update_userid "$userID"
        done
        log "Run the following to update your monkeysphere authorized_keys file:"
        log "$PGRM update-authorized_keys"