enforce --no-armor when exporting to openpgp2ssh in case weird gpg.conf options ...

[monkeysphere.git] / src / monkeysphere-host

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 17330216301a7ef412054269a0986b0637c77c66..d89febb690ed92c1c84f1f27eaa0f446b63fce1b 100755 (executable)
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -256,11 +256,12 @@ multi_key() {
     shift
     local keys=$@
     local i=0
-    local fprs=($(list_primary_fingerprints <"$HOST_KEY_FILE"))
     local key
 
     check_no_keys
 
+    local fprs=($(list_primary_fingerprints <"$HOST_KEY_FILE"))
+
     if [[ -z "$1" || "$1" == '--all' ]] ; then
        keys="${fprs[@]}"
     fi
@@ -301,7 +302,7 @@ show_key() {
 
     # create the ssh key
     tmpssh="$GNUPGHOME"/ssh_host_key_rsa_pub
-    gpg --export "$fingerprint" 2>/dev/null \
+    gpg --export --no-armor "$fingerprint" 2>/dev/null \
        | openpgp2ssh 2>/dev/null >"$tmpssh"
 
     # list the host key info
@@ -378,7 +379,7 @@ COMMAND="$1"
 shift
 
 case $COMMAND in
-    'import-key'|'i')
+    'import-key'|'import'|'i')
        source "${MHSHAREDIR}/import_key"
        import_key "$@"
        ;;
@@ -387,7 +388,7 @@ case $COMMAND in
        multi_key show_key "$@"
        ;;
 
-    'set-expire'|'extend-key'|'e')
+    'set-expire'|'extend-key'|'extend'|'e')
        source "${MHSHAREDIR}/set_expire"
        set_expire "$@"
        ;;