X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fshare%2Fmh%2Fadd_name;h=39ebaceeb0dfe684b8713b547cc08af31f61efa5;hb=39d013c4d307d6a844f8dc2deabf42adc0a8a388;hp=b5922db412c2a8c2f1f701bed4a65d4290c8c7cb;hpb=ce45ef5702e072e869fa9d1b703f99dc740eb000;p=monkeysphere.git

diff --git a/src/share/mh/add_name b/src/share/mh/add_name
index b5922db..39ebace 100644
--- a/src/share/mh/add_name
+++ b/src/share/mh/add_name
@@ -34,9 +34,12 @@ 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
+if [ "$PROMPT" != "false" ] ; then
     printf "The following service name will be added to key '$keyID':\n  %s\nAre you sure you would like to add this service name? (Y/n) " "$serviceName" >&2
     read OK; OK=${OK:=Y}
     if [ "${OK/y/Y}" != 'Y' ] ; 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"