further debianization work. (also, made src/common non-executable,

[monkeysphere.git] / src / monkeysphere

diff --git a/src/monkeysphere b/src/monkeysphere
index c417625ee2fb3dee31e28a536d1ce138f695e7d4..5d865c96a3a7a747aa7054213500149baaec3ca4 100755 (executable)
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -35,8 +35,8 @@ Monkeysphere client tool.
 
 subcommands:
   update-known_hosts (k) [HOST]...  update known_hosts file
-  update-authorized_keys (a)        update authorized_keys file
   update-userids (u) [USERID]...    add/update userid
+  update-authorized_keys (a)        update authorized_keys file
   gen-ae-subkey (g) KEYID           generate an 'ae' capable subkey
   help (h,?)                        this help
 
@@ -54,9 +54,9 @@ gen_ae_subkey(){
     keyID="$1"
 
     # set subkey defaults
-    SUBKEY_TYPE=${KEY_TYPE:-RSA}
-    SUBKEY_LENGTH=${KEY_LENGTH:-1024}
-    SUBKEY_USAGE=${KEY_USAGE:-encrypt,auth}
+    SUBKEY_TYPE=${KEY_TYPE:-"RSA"}
+    SUBKEY_LENGTH=${KEY_LENGTH:-"1024"}
+    SUBKEY_USAGE=${KEY_USAGE:-"encrypt,auth"}
 
     gpgOut=$(gpg --fixed-list-mode --list-keys --with-colons \
        "$keyID" 2> /dev/null)
@@ -170,7 +170,7 @@ case $COMMAND in
        userAuthorizedKeys=${USER_CONTROLLED_AUTHORIZED_KEYS/\%h/"$HOME"}
 
        # update authorized_keys
-       update_authorized_keys "$userKeysCacheDir" "$msAuthorizedKeys" "$userAuthorizedKeys"
+       update_authorized_keys "$msAuthorizedKeys" "$userAuthorizedKeys" "$userKeysCacheDir"
        ;;
 
     'update-userids'|'u')