X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fshare%2Fmh%2Fimport_key;h=bca7319c0e400a30977d5e70152e7d6b3cb41360;hb=e1dcdd693b854afaddb58c2049585ac9247f69a6;hp=557bb7faaee6712942bfe5bdd0eb5b195013c505;hpb=c1924de73702d0f999a44bc63df9bee0d432636a;p=monkeysphere.git

diff --git a/src/share/mh/import_key b/src/share/mh/import_key
index 557bb7f..bca7319 100644
--- a/src/share/mh/import_key
+++ b/src/share/mh/import_key
@@ -21,7 +21,7 @@ hostName="$1"
 
 # use the default hostname if not specified
 if [ -z "$hostName" ] ; then
-    hostName=$(hostname -f)
+    hostName=$(hostname -f) || failure "Could not determine hostname."
     # test that the domain is not obviously illegitimate
     domain=${foo##*.}
     case $domain in
@@ -39,14 +39,13 @@ userID="ssh://${hostName}"
 
 # create host home
 mkdir -p "${MHDATADIR}"
-mkdir -p "${MHTMPDIR}"
 mkdir -p "${GNUPGHOME_HOST}"
 chmod 700 "${GNUPGHOME_HOST}"
 
 log verbose "importing ssh key..."
 # translate ssh key to a private key
 PEM2OPENPGP_USAGE_FLAGS=authenticate pem2openpgp "$userID" \
-    | gpg_host --import 2>&1 | log debug
+    | gpg_host --import
 
 # load the new host fpr into the fpr variable.  this is so we can
 # create the gpg pub key file.  we have to do this from the secret key