From 433208a5536608c2b40525eebadbbdeb7780d7f2 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Fri, 31 Oct 2014 09:22:47 +0100
Subject: [PATCH] gpg: Fix testing for secret key availability.

* g10/getkey.c (have_secret_key_with_kid): Do not change the search
mode.
--

The search mode was accidentally changed to search-next after finding
the first keyblock.  The intention was to look for a duplicate keyid
in the keydb which works by not doing a keydb_search_reset.

Signed-off-by: Werner Koch <wk@gnupg.org>
---
 g10/getkey.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/g10/getkey.c b/g10/getkey.c
index 2ddd5894b..279b3d95f 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -3012,7 +3012,6 @@ have_secret_key_with_kid (u32 *keyid)
   desc.u.kid[1] = keyid[1];
   while (!result && !(err = keydb_search (kdbhd, &desc, 1, NULL)))
     {
-      desc.mode = KEYDB_SEARCH_MODE_NEXT;
       err = keydb_get_keyblock (kdbhd, &keyblock);
       if (err)
         {