[Pkg-gnupg-commit] [gnupg2] 123/241: gpg: Default to the the PGP trust model.

[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 67c701d1e53f56305e3b8771c683c45bb9672305
Author: Neal H. Walfield <neal at g10code.com>
Date:   Tue Nov 10 08:05:17 2015 +0100

    gpg: Default to the the PGP trust model.
    
    * g10/trustdb.c (init_trustdb): If we can't read the trust model from
    the trust DB, default to TM_PGP, not TM_TOFU_PGP.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>
---
 g10/trustdb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/g10/trustdb.c b/g10/trustdb.c
index 64de985..4f60f1f 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -466,8 +466,8 @@ init_trustdb ()
 	 && opt.trust_model != TM_EXTERNAL)
 	{
 	  log_info(_("unable to use unknown trust model (%d) - "
-		     "assuming %s trust model\n"),opt.trust_model,"tofu+pgp");
-	  opt.trust_model = TM_TOFU_PGP;
+		     "assuming %s trust model\n"),opt.trust_model,"pgp");
+	  opt.trust_model = TM_PGP;
 	}
 
       if(opt.verbose)

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