X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere;h=15a2a7aa48d32993112244223126ea6e758f02f0;hb=da1b5d2ac24dc165b180f60cc6df69822496986a;hp=11254e7e570deac44d57ee00442400e2780d52e5;hpb=c6ba2bb28cf594f2a613b989fe7cd71d9550633a;p=monkeysphere.git

diff --git a/src/monkeysphere b/src/monkeysphere
index 11254e7..15a2a7a 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -128,15 +128,17 @@ MS_CONF=${MS_CONF:-"${MS_HOME}/monkeysphere.conf"}
 [ -e "$MS_CONF" ] && . "$MS_CONF"
 
 # set empty config variable with defaults
-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:-"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"}
 HASH_KNOWN_HOSTS=${HASH_KNOWN_HOSTS:-"true"}
+AUTHORIZED_KEYS=${AUTHORIZED_KEYS:-"${HOME}/.ssh/authorized_keys"}
+
+# other variables
+AUTHORIZED_USER_IDS=${AUTHORIZED_USER_IDS:-"${MS_HOME}/authorized_user_ids"}
+REQUIRED_HOST_KEY_CAPABILITY=${REQUIRED_HOST_KEY_CAPABILITY:-"a"}
+REQUIRED_USER_KEY_CAPABILITY=${REQUIRED_USER_KEY_CAPABILITY:-"a"}
 
 export GNUPGHOME
 
@@ -146,7 +148,6 @@ mkdir -p -m 0700 "$GNUPGHOME"
 # make sure the user monkeysphere home directory exists
 mkdir -p -m 0700 "$MS_HOME"
 touch "$AUTHORIZED_USER_IDS"
-touch "$AUTHORIZED_KEYS"
 
 case $COMMAND in
     'update-known_hosts'|'update-known-hosts'|'k')
@@ -167,7 +168,6 @@ case $COMMAND in
 	    if [ ! -s "$KNOWN_HOSTS" ] ; then
 		failure "known_hosts file '$KNOWN_HOSTS' is empty."
 	    fi
-	    log "processing known_hosts file..."
 	    process_known_hosts || ERR=1
 	fi
 
@@ -183,7 +183,6 @@ case $COMMAND in
 	fi
 
 	# process authorized_user_ids file
-	log "processing authorized_user_ids file..."
 	process_authorized_user_ids "$AUTHORIZED_USER_IDS" || ERR=1
 	log "authorized_keys file updated."
 	;;