security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-20 14:37:08 +01:00
Code Activity

* keyedit.c (show_key_with_all_names): Ownertrust is only meaningful for

Browse Source 
the PGP or classic trust models.  Both validity and ownertrust are not
meaningful for the always trust model.
This commit is contained in:
David Shaw 2003-10-14 00:05:44 +00:00
parent 90bd542151
commit 837df305c6
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
g10/ChangeLog
View 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> 2003-10-11 Werner Koch <wk@gnupg.org>
* keygen.c: Always enable the gen_card_key prototype. * keygen.c: Always enable the gen_card_key prototype.

6
g10/keyedit.c
View File

@ -2078,13 +2078,19 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
tty_printf("\n"); tty_printf("\n");
if( node->pkt->pkttype == PKT_PUBLIC_KEY ) if( node->pkt->pkttype == PKT_PUBLIC_KEY )
{
if(opt.trust_model!=TM_ALWAYS)
{ {
tty_printf(" "); tty_printf(" ");
if(opt.list_options&LIST_SHOW_LONG_KEYID) if(opt.list_options&LIST_SHOW_LONG_KEYID)
tty_printf(" "); 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(_("trust: %-13s"), otrust);
tty_printf(_("validity: %s"), trust ); tty_printf(_("validity: %s"), trust );
tty_printf("\n"); tty_printf("\n");
}
if( node->pkt->pkttype == PKT_PUBLIC_KEY if( node->pkt->pkttype == PKT_PUBLIC_KEY
&& (get_ownertrust (pk)&TRUST_FLAG_DISABLED)) && (get_ownertrust (pk)&TRUST_FLAG_DISABLED))
{ {