X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere;h=a9c9d5856002acf42e99c4f757e347a7d3967536;hb=fe0e35fa72edb5bbb9e2026b8e5c920a5c3f6a86;hp=6853f581ff2ff1b81083ed385ba3566326be7f32;hpb=b92675786ac883551528b3870c71c98066d60c0f;p=monkeysphere.git

diff --git a/src/monkeysphere b/src/monkeysphere
index 6853f58..a9c9d58 100755
--- 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."
 	;;