[git] GnuPG - branch, master, updated. gnupg-2.1.9-123-g67c701d

[by Neal H. Walfield]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  67c701d1e53f56305e3b8771c683c45bb9672305 (commit)
       via  951f277b6bf8178560105538d38e2a07a96865bd (commit)
      from  288c9919dc45496b2380eeac487a8539692d6842 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
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>

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)

commit 951f277b6bf8178560105538d38e2a07a96865bd
Author: Neal H. Walfield <neal at g10code.com>
Date:   Tue Nov 10 08:03:57 2015 +0100

    gpg: Default to the flat TOFU DB format.
    
    * g10/tofu.c (opendbs): If the TOFU DB format is set to auto and there
    is no TOFU DB, default to the flat format.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>

diff --git a/g10/tofu.c b/g10/tofu.c
index f6d2d5e..f7dd40d 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -1014,9 +1014,9 @@ opendbs (void)
 	}
       else
 	{
-	  opt.tofu_db_format = TOFU_DB_SPLIT;
+	  opt.tofu_db_format = TOFU_DB_FLAT;
 	  if (DBG_TRUST)
-	    log_debug ("Using split format for TOFU DB.\n");
+	    log_debug ("Using flat format for TOFU DB.\n");
 	}
     }
 

-----------------------------------------------------------------------

Summary of changes:
 g10/tofu.c    | 4 ++--
 g10/trustdb.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org