summaryrefslogtreecommitdiff
path: root/src/share/mh
diff options
context:
space:
mode:
Diffstat (limited to 'src/share/mh')
-rw-r--r--src/share/mh/add_name3
-rw-r--r--src/share/mh/import_key3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/share/mh/add_name b/src/share/mh/add_name
index 0eeefb7..754ced4 100644
--- 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
diff --git a/src/share/mh/import_key b/src/share/mh/import_key
index 1b6f267..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"