* keyedit.c (show_key_with_all_names): Ownertrust is only meaningful for
authorDavid Shaw <dshaw@jabberwocky.com>
Tue, 14 Oct 2003 00:05:44 +0000 (00:05 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Tue, 14 Oct 2003 00:05:44 +0000 (00:05 +0000)
the PGP or classic trust models.  Both validity and ownertrust are not
meaningful for the always trust model.

g10/ChangeLog
g10/keyedit.c

index e45d021..2e1149c 100644 (file)
@@ -1,3 +1,9 @@
+2003-10-13  David Shaw  <dshaw@jabberwocky.com>
+
+       * keyedit.c (show_key_with_all_names): Ownertrust is only
+       meaningful for the PGP or classic trust models.  Both validity and
+       ownertrust are not meaningful for the always trust model.
+
 2003-10-11  Werner Koch  <wk@gnupg.org>
 
        * keygen.c: Always enable the gen_card_key prototype.
index 633209e..6b9d8fd 100644 (file)
@@ -2079,12 +2079,18 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
 
            if( node->pkt->pkttype == PKT_PUBLIC_KEY )
              {
-               tty_printf("                     ");
-               if(opt.list_options&LIST_SHOW_LONG_KEYID)
-                 tty_printf("        ");
-               tty_printf(_("trust: %-13s"), otrust);
-               tty_printf(_("validity: %s"), trust );
-               tty_printf("\n");
+               if(opt.trust_model!=TM_ALWAYS)
+                 {
+                   tty_printf("                     ");
+                   if(opt.list_options&LIST_SHOW_LONG_KEYID)
+                     tty_printf("        ");
+                   /* Ownertrust is only meaningful for the PGP or
+                      classic trust models */
+                   if(opt.trust_model==TM_PGP || opt.trust_model==TM_CLASSIC)
+                     tty_printf(_("trust: %-13s"), otrust);
+                   tty_printf(_("validity: %s"), trust );
+                   tty_printf("\n");
+                 }
                if( node->pkt->pkttype == PKT_PUBLIC_KEY
                    && (get_ownertrust (pk)&TRUST_FLAG_DISABLED))
                  {