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

* packet.h, keyedit.c (menu_clean_uids_from_key), trustdb.c

(clean_uids_from_key): Fix display bug where sigs cleaned for other
reasons caused a uid to appear as if it had been compacted.
This commit is contained in:
David Shaw 2005-11-10 23:16:34 +00:00
parent ce1ce8910e
commit 843d5719e7
4 changed files with 18 additions and 20 deletions

View file

@ -3225,30 +3225,26 @@ menu_clean_uids_from_key(KBNODE keyblock)
if(modified)
{
KBNODE node,uidnode=NULL;
KBNODE node;
for(node=keyblock->next;node;node=node->next)
{
if(node->pkt->pkttype==PKT_USER_ID)
uidnode=node;
else if(uidnode && node->pkt->pkttype==PKT_SIGNATURE
&& is_deleted_kbnode(node))
if(node->pkt->pkttype==PKT_USER_ID
&& node->pkt->pkt.user_id->flags.compacted)
{
const char *reason;
char *user=utf8_to_native(uidnode->pkt->pkt.user_id->name,
uidnode->pkt->pkt.user_id->len,0);
char *user=utf8_to_native(node->pkt->pkt.user_id->name,
node->pkt->pkt.user_id->len,0);
if(uidnode->pkt->pkt.user_id->is_revoked)
if(node->pkt->pkt.user_id->is_revoked)
reason=_("revoked");
else if(uidnode->pkt->pkt.user_id->is_expired)
else if(node->pkt->pkt.user_id->is_expired)
reason=_("expired");
else
reason=_("invalid");
tty_printf("User ID \"%s\" compacted: %s\n",user,reason);
uidnode=NULL;
xfree(user);
}
}