From: Jameson Rollins <jrollins@finestructure.net>
Date: Mon, 18 Jan 2010 16:43:06 +0000 (-0500)
Subject: add check that service name isn't already in use in import_key
X-Git-Tag: monkeysphere_0.28~28
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ef41243e3947608568579fde82bef1f5c74bda47;p=monkeysphere.git

add check that service name isn't already in use in import_key
---

diff --git a/src/share/mh/import_key b/src/share/mh/import_key
index ada2914..fea3d27 100644
--- 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"