X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fshare%2Fmh%2Fimport_key;h=bca7319c0e400a30977d5e70152e7d6b3cb41360;hb=a66c00cfa6443c1ed027e796b47132df64a91b7d;hp=74dc0b3816d7584b2483498238efb6599299896b;hpb=0c874fdd6abfa4b74d7805f2d2d121f08211b4aa;p=monkeysphere.git

diff --git a/src/share/mh/import_key b/src/share/mh/import_key
index 74dc0b3..bca7319 100644
--- a/src/share/mh/import_key
+++ b/src/share/mh/import_key
@@ -14,14 +14,31 @@
 import_key() {
 
 local hostName
+local domain
 local userID
 
-hostName=${1:-$(hostname -f)}
+hostName="$1"
+
+# use the default hostname if not specified
+if [ -z "$hostName" ] ; then
+    hostName=$(hostname -f) || failure "Could not determine hostname."
+    # test that the domain is not obviously illegitimate
+    domain=${foo##*.}
+    case $domain in
+	'local'|'localdomain')
+	    failure "Host domain '$domain' is not legitimate.  Aborting key import."
+	    ;;
+    esac
+    # test that there are at least two parts
+    if (( $(echo "$hostName" | tr . ' ' | wc -w) < 2 )) ; then
+	failure "Host name '$hostName' is not legitimate.  Aborting key import."
+    fi
+fi
+
 userID="ssh://${hostName}"
 
 # create host home
 mkdir -p "${MHDATADIR}"
-mkdir -p "${MHTMPDIR}"
 mkdir -p "${GNUPGHOME_HOST}"
 chmod 700 "${GNUPGHOME_HOST}"
 
@@ -37,7 +54,9 @@ PEM2OPENPGP_USAGE_FLAGS=authenticate pem2openpgp "$userID" \
 load_fingerprint_secret
 
 # export to gpg public key to file
-create_gpg_pub_file
+update_gpg_pub_file
+
+log info "host key imported:"
 
 # show info about new key
 show_key