[git] GnuPG - branch, master, updated. gnupg-2.1.10-27-gf5aa51a

[by Damien Goutte-Gattat]

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  f5aa51aaacfe13ab9528aa9b88d8ce8eb61362fc (commit)
      from  e573e6188dada4d70f6897aa2fda3c3af8c50441 (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 f5aa51aaacfe13ab9528aa9b88d8ce8eb61362fc
Author: Damien Goutte-Gattat <dgouttegattat at incenp.org>
Date:   Mon Dec 14 09:31:08 2015 +0100

    gpg: Print ownertrust in TOFU+PGP trust model.
    
    * g10/keyedit.c: Print ownertrust in TOFU+PGP trust model.
    --
    
    The key editor currently prints out the ownertrust value assigned
    to a key only when using the classic or PGP trust models; but
    that value is also meaningful in the recently introduced TOFU+PGP
    combined model.
    
    Signed-off-by: Damien Goutte-Gattat <dgouttegattat at incenp.org>

diff --git a/g10/keyedit.c b/g10/keyedit.c
index 0a4766e..d958db8 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -3233,9 +3233,10 @@ show_key_with_all_names (ctrl_t ctrl, estream_t fp,
                                opt.legacy_list_mode?
                                ((int) keystrlen () + 13):5, "");
 		  /* Ownertrust is only meaningful for the PGP or
-		     classic trust models */
+		     classic trust models, or PGP combined with TOFU */
 		  if (opt.trust_model == TM_PGP
-		      || opt.trust_model == TM_CLASSIC)
+		      || opt.trust_model == TM_CLASSIC
+		      || opt.trust_model == TM_TOFU_PGP)
 		    {
 		      int width = 14 - strlen (otrust);
 		      if (width <= 0)

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

Summary of changes:
 g10/keyedit.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


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