[Pkg-gnupg-commit] [gnupg2] 84/241: gpg: Fix keyring support.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 99c84b49b787dab8da26cf61eed24dd4a2b77fd9
Author: Neal H. Walfield <neal at g10code.com>
Date:   Thu Oct 29 09:52:56 2015 +0100

    gpg: Fix keyring support.
    
    * g10/keydb.c (keydb_rebuild_caches): Only mark the cached as prepared
    if it is actually prepared, which it only is if the resource is a
    keybox.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>
---
 g10/keydb.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/g10/keydb.c b/g10/keydb.c
index da18bc0..bcafe90 100644
--- a/g10/keydb.c
+++ b/g10/keydb.c
@@ -1701,7 +1701,8 @@ keydb_search (KEYDB_HANDLE hd, KEYDB_SEARCH_DESC *desc,
   if (!hd->no_caching
       && !rc
       && ndesc == 1 && (desc[0].mode == KEYDB_SEARCH_MODE_FPR20
-                        || desc[0].mode == KEYDB_SEARCH_MODE_FPR))
+                        || desc[0].mode == KEYDB_SEARCH_MODE_FPR)
+      && hd->active[hd->current].type == KEYDB_RESOURCE_TYPE_KEYBOX)
     {
       hd->keyblock_cache.state = KEYBLOCK_CACHE_PREPARED;
       memcpy (hd->keyblock_cache.fpr, desc[0].u.fpr, 20);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git