diff options
| author | David Shaw <[email protected]> | 2003-10-14 00:05:44 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-10-14 00:05:44 +0000 |
| commit | 837df305c67fa071478cb0c7845d667798d434c7 (patch) | |
| tree | 465152149561535fa0b7d7dfb2f8f027c4408b0e | |
| parent | * srv.c: OSX 10.2.8/Darwin 6.8 seems to have some #include ordering (diff) | |
| download | gnupg-837df305c67fa071478cb0c7845d667798d434c7.tar.gz gnupg-837df305c67fa071478cb0c7845d667798d434c7.zip | |
* 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.
| -rw-r--r-- | g10/ChangeLog | 6 | ||||
| -rw-r--r-- | g10/keyedit.c | 18 |
2 files changed, 18 insertions, 6 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index e45d02100..2e1149c08 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,9 @@ +2003-10-13 David Shaw <[email protected]> + + * 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 <[email protected]> * keygen.c: Always enable the gen_card_key prototype. diff --git a/g10/keyedit.c b/g10/keyedit.c index 633209eed..6b9d8fd91 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -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)) { |