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

diff --git a/src/share/mh/import_key b/src/share/mh/import_key
index ada2914..0f362b8 100644
--- a/src/share/mh/import_key
+++ b/src/share/mh/import_key
@@ -26,6 +26,9 @@ if [ -z "$serviceName" ] ; then
     failure "You must specify a service name for use in the OpenPGP certificate user ID."
 fi
 
+# test that a key with that user ID does not already exist
+prompt_userid_exists "$serviceName"
+
 # check that the service name is well formatted
 check_service_name "$serviceName"
 
@@ -46,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:"