add prompt if a service name is already being used then importing a key or adding...

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

diff --git a/src/share/mh/add_name b/src/share/mh/add_name
index b5922db412c2a8c2f1f701bed4a65d4290c8c7cb..754ced45f47774c9e18414a4467fc6e8c7ebf307 100644 (file)
--- a/src/share/mh/add_name
+++ b/src/share/mh/add_name
@@ -34,6 +34,9 @@ keyID=$(check_key_input "$@")
 check_key_userid "$keyID" "$serviceName" && \
     failure "Service name '$serviceName' already exists on key '$keyID'."
 
+# test that a key with that user ID does not already exist
+prompt_userid_exists "$serviceName"
+
 check_service_name "$serviceName"
 
 if [ "$PROMPT" = "true" ] ; then
@@ -54,7 +57,7 @@ if PEM2OPENPGP_USAGE_FLAGS=authenticate \
 
     gpg_host --check-trustdb
 
-    update_gpg_pub_file
+    update_pgp_pub_file
 
     show_key "$keyID"