Merge commit 'jrollins/master'

diff --git a/src/share/mh/import_key b/src/share/mh/import_key
index cca40fa09e7424af87f82a7f638901b052bf98b8..bca7319c0e400a30977d5e70152e7d6b3cb41360 100644 (file)
--- 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