renaming m-h update_gpg_pub_file to update_pgp_pub_file

[monkeysphere.git] / src / share / mh / import_key

diff --git a/src/share/mh/import_key b/src/share/mh/import_key
index ada291474aefe6a61268923d488eba24c89aba46..1b6f267b1e15c5c7c8e5a46775533661efc29cb3 100644 (file)
--- a/src/share/mh/import_key
+++ b/src/share/mh/import_key
@@ -26,6 +26,10 @@ 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
+check_key_userid "$serviceName" "$serviceName" && \
+    failure "A key with service name '$serviceName' already exists."
+
 # check that the service name is well formatted
 check_service_name "$serviceName"
 
@@ -46,8 +50,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:"