merging from jrollins

[monkeysphere.git] / src / subcommands / mh / import-key

diff --git a/src/subcommands/mh/import-key b/src/subcommands/mh/import-key
index d60e982c38a047852b3c4b51620f888674a838c7..ac67711742859ad20e898fc2c45248d9fafd35f9 100755 (executable)
--- a/src/subcommands/mh/import-key
+++ b/src/subcommands/mh/import-key
@@ -23,10 +23,6 @@ fingerprint_server_key >/dev/null \
 # get options
 while true ; do
        case "$1" in
-           -h|--hostname)
-               hostName="$2"
-               shift 2
-               ;;
            -f|--keyfile)
                keyFile="$2"
                shift 2
@@ -40,6 +36,9 @@ while true ; do
                    failure "Unknown option '$1'.
 Type '$PGRM help' for usage."
                fi
+               hostName="$1"
+               shift
+               ;;
                break
                ;;
        esac