added comments to seckey2sshagent.

[monkeysphere.git] / src / monkeysphere

diff --git a/src/monkeysphere b/src/monkeysphere
index 6853f581ff2ff1b81083ed385ba3566326be7f32..a9c9d5856002acf42e99c4f757e347a7d3967536 100755 (executable)
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -115,7 +115,7 @@ 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_HOST_KEY_CAPABILITY=${REQUIRED_HOST_KEY_CAPABILITY:-"a"}
 REQUIRED_USER_KEY_CAPABILITY=${REQUIRED_USER_KEY_CAPABILITY:-"a"}
 KNOWN_HOSTS=${KNOWN_HOSTS:-"${HOME}/.ssh/known_hosts"}
 AUTHORIZED_KEYS=${AUTHORIZED_KEYS:-"${HOME}/.ssh/authorized_keys"}
@@ -164,7 +164,7 @@ case $COMMAND in
            failure "you must specify at least one userid."
        fi
        for userID ; do
-           update_userid "$userID"
+           update_userid "$userID" "$AUTHORIZED_USER_IDS"
        done
        log "Run the following to update your monkeysphere authorized_keys file:"
        log "$PGRM update-authorized_keys"
@@ -175,7 +175,7 @@ case $COMMAND in
            failure "you must specify at least one userid."
        fi
        for userID ; do
-           remove_userid "$userID"
+           remove_userid "$userID" "$AUTHORIZED_USER_IDS"
        done
        log "Run the following to update your monkeysphere authorized_keys file:"
        log "$PGRM update-authorized_keys"
@@ -191,7 +191,7 @@ case $COMMAND in
 
        # process authorized_user_ids file
        log "processing authorized_user_ids file..."
-       process_authorized_user_ids
+       process_authorized_user_ids "$AUTHORIZED_USER_IDS"
        log "authorized_keys file updated."
        ;;