X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fshare%2Fmh%2Fimport_key;h=0f362b8ce8aff7f1c95d8b56da9b9b3e963ce6ee;hb=c39d11682121a43e690465d194a5bd9fa2275f42;hp=fea3d277094479b95b2c570a70cd85aa59d44175;hpb=ef41243e3947608568579fde82bef1f5c74bda47;p=monkeysphere.git

diff --git a/src/share/mh/import_key b/src/share/mh/import_key
index fea3d27..0f362b8 100644
--- a/src/share/mh/import_key
+++ b/src/share/mh/import_key
@@ -27,8 +27,7 @@ if [ -z "$serviceName" ] ; then
 fi
 
 # test that a key with that user ID does not already exist
-check_key_userid "$serviceName" "$serviceName" && \
-    failure "A key with service name '$serviceName' already exists."
+prompt_userid_exists "$serviceName"
 
 # check that the service name is well formatted
 check_service_name "$serviceName"
@@ -50,8 +49,8 @@ else
 	| gpg_host --import
 fi
 
-# export to gpg public key to file
-update_gpg_pub_file
+# export to OpenPGP public key to file
+update_pgp_pub_file
 
 log info "host key imported:"