Merge commit 'dkg/master'

[monkeysphere.git] / src / monkeysphere-server

diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index 6eeb7021dc1de7965dd81e75f37fb509e5b2cca8..a109cf533229c78074e1fe543e37569b49618321 100755 (executable)
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -44,10 +44,10 @@ EOF
 # generate server gpg key
 gen_key() {
     # set key defaults
-    KEY_TYPE=${KEY_TYPE:-RSA}
-    KEY_LENGTH=${KEY_LENGTH:-2048}
-    KEY_USAGE=${KEY_USAGE:-encrypt,auth}
-    SERVICE=${SERVICE:-ssh}
+    KEY_TYPE=${KEY_TYPE:-"RSA"}
+    KEY_LENGTH=${KEY_LENGTH:-"2048"}
+    KEY_USAGE=${KEY_USAGE:-"encrypt,auth"}
+    SERVICE=${SERVICE:-"ssh"}
     HOSTNAME_FQDN=${HOSTNAME_FQDN:-$(hostname -f)}
 
     USERID=${USERID:-"$SERVICE"://"$HOSTNAME_FQDN"}
@@ -145,9 +145,10 @@ case $COMMAND in
        fi
 
        for uname in $unames ; do
+           MODE="authorized_keys"
+
            log "----- user: $uname -----"
 
-           MODE="authorized_keys"
            AUTHORIZED_USER_IDS="$MS_HOME"/authorized_user_ids/"$uname"
            cacheDir="$STAGING_AREA"/"$uname"/user_keys
            msAuthorizedKeys="$STAGING_AREA"/"$uname"/authorized_keys
@@ -167,6 +168,7 @@ case $COMMAND in
            # update authorized_keys
            update_authorized_keys "$cacheDir" "$msAuthorizedKeys" "$userAuthorizedKeys"
        done
+
        log "----- done. -----"
        ;;