gpg: Default to the the PGP trust model.
authorNeal H. Walfield <neal@g10code.com>
Tue, 10 Nov 2015 07:05:17 +0000 (08:05 +0100)
committerNeal H. Walfield <neal@g10code.com>
Tue, 10 Nov 2015 07:05:17 +0000 (08:05 +0100)
* 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@g10code.com>
g10/trustdb.c

index 64de985..4f60f1f 100644 (file)
@@ -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)