diff options
| author | David Shaw <[email protected]> | 2004-10-05 14:33:02 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-10-05 14:33:02 +0000 |
| commit | 8c72ff9543def9eb82105c085a18b48ab6044312 (patch) | |
| tree | 773ebe50cdb30256a74b416e59efe83106d21211 /g10/keyedit.c | |
| parent | 2004-10-03 Timo Schulz <[email protected]> (diff) | |
| download | gnupg-8c72ff9543def9eb82105c085a18b48ab6044312.tar.gz gnupg-8c72ff9543def9eb82105c085a18b48ab6044312.zip | |
* passphrase.c (agent_get_passphrase): Use keystrs for agent strings, and
fix sprintf warnings.
* keyserver.c (keyserver_spawn): Fix BUG() with certain sets of mixed
regular and preferred keyserver refreshes. Noted by Sebastian Wiesinger.
* keyedit.c (show_key_with_all_names): Show uid validity in menu.
Diffstat (limited to 'g10/keyedit.c')
| -rw-r--r-- | g10/keyedit.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/g10/keyedit.c b/g10/keyedit.c index 5a8182859..1ba8953dd 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -2170,7 +2170,7 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker, { KBNODE node; int i; - int do_warn = 0, indent=0; + int do_warn = 0; byte pk_version=0; PKT_public_key *primary=NULL; @@ -2324,17 +2324,6 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker, /* the user ids */ - for( node = keyblock; node; node = node->next ) - { - if(node->pkt->pkttype == PKT_USER_ID - && (node->pkt->pkt.user_id->is_revoked - || node->pkt->pkt.user_id->is_expired)) - { - indent=1; - break; - } - } - i = 0; for( node = keyblock; node; node = node->next ) { if( node->pkt->pkttype == PKT_USER_ID ) { @@ -2345,11 +2334,9 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker, tty_printf("[%8.8s] ",_("revoked")); else if(uid->is_expired) tty_printf("[%8.8s] ",_("expired")); - else if(opt.list_options&LIST_SHOW_UID_VALIDITY && primary) + else if(primary) tty_printf("[%8.8s] ", trust_value_to_string(get_validity(primary,uid))); - else if(indent) - tty_printf(" "); if( only_marked ) tty_printf(" "); else if( node->flag & NODFLG_SELUID ) |