From eae982ed6d69644258afe9c4ad1be553853d8403 Mon Sep 17 00:00:00 2001
From: "Neal H. Walfield" <neal@g10code.com>
Date: Tue, 17 Nov 2015 13:42:43 +0100
Subject: gpg: Use a more appropriate error code.

* g10/gpg.c (check_user_ids): Return a more appropriate error code if
a user id is ambiguous.

--
Signed-off-by: Neal H. Walfield <neal@g10code.com>
---
 g10/gpg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/g10/gpg.c b/g10/gpg.c
index dacfa7489..0cc7038fa 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -2209,7 +2209,7 @@ check_user_ids (strlist_t *sp,
             log_info (_("(check argument of option '%s')\n"), option);
 
           if (! rc)
-            rc = GPG_ERR_CONFLICT;
+            rc = GPG_ERR_AMBIGUOUS_NAME;
 
           err = keydb_get_keyblock (hd, &kb);
           if (err)
-- 
cgit v1.2.3