[Pkg-gnupg-commit] [gnupg2] 04/15: fix_751266

[David Prévot]

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

taffit pushed a commit to branch patch-queue/l10n
in repository gnupg2.

commit a16421fca212babac1b0c21ac8ff1d918d21101f
Author: Debian GnuPG Maintainers <pkg-gnupg-maint at lists.alioth.debian.org>
Date:   Thu Nov 13 19:30:39 2014 -0400

    fix_751266
    
    commit 07006c9916ea194ce6047d252421c08489068c4c
    Author: Kristian Fiskerstrand <kf at sumptuouscapital.com>
    Date:   Wed Aug 13 11:13:34 2014 +0200
    
        gpg: Need to init the trustdb for import.
    
        * g10/trustdb.c (clear_ownertrusts): Init trustdb.
    
        --
    
        This was fixed in 1.4 branch in commit
        23191d7851eae2217ecdac6484349849a24fd94a but was not applied to the
        2.0 branch that exhibits the same problem. This is actually a hack
        to fix a bug introduced with commit 2528178.
    
        GnuPG-bug-id: 1622
---
 g10/trustdb.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/g10/trustdb.c b/g10/trustdb.c
index f96701a..7bfef25 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -923,6 +923,8 @@ clear_ownertrusts (PKT_public_key *pk)
   TRUSTREC rec;
   int rc;
 
+  init_trustdb();
+
   if (trustdb_args.no_trustdb && opt.trust_model == TM_ALWAYS)
     return 0;
 

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