security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

* passphrase.c (agent_get_passphrase): Use keystrs for agent strings, and

Browse source 
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.
This commit is contained in:
David Shaw 2004-10-05 14:33:02 +00:00
parent eb02f5b46a
commit 8c72ff9543
4 changed files with 37 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

17
g10/keyedit.c
View file

@ -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 )