mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* import.c (import_one): Do collapse_uids() before we do any cleaning
so keyserver mangled keys with doubled user IDs can be properly cleaned - possibly sigs on the different user IDs cancel each other out. * import.c (parse_import_options), export.c (parse_export_options): List "xxx-clean" before the longer options so we don't end up with a partial match on the longer options. * trustdb.c (clean_uids_from_key): Return proper number of cleaned user IDs. Don't count user IDs as cleaned unless we actually delete something.
This commit is contained in:
parent
74ee007922
commit
19de04694e
4 changed files with 28 additions and 9 deletions
|
@ -1654,7 +1654,7 @@ clean_sigs_from_uid(KBNODE keyblock,KBNODE uidnode,int noisy)
|
|||
int
|
||||
clean_uids_from_key(KBNODE keyblock,int noisy)
|
||||
{
|
||||
int delete_until_next=0,deleted=0;
|
||||
int delete_until_next=0,deleting=0,deleted=0;
|
||||
KBNODE node,signode=NULL;
|
||||
u32 keyid[2],sigdate=0;
|
||||
|
||||
|
@ -1684,6 +1684,7 @@ clean_uids_from_key(KBNODE keyblock,int noisy)
|
|||
else
|
||||
{
|
||||
delete_until_next=1;
|
||||
deleting=1;
|
||||
|
||||
if(noisy)
|
||||
{
|
||||
|
@ -1722,7 +1723,11 @@ clean_uids_from_key(KBNODE keyblock,int noisy)
|
|||
if(delete_until_next && !sig->flags.chosen_selfsig)
|
||||
{
|
||||
delete_kbnode(node);
|
||||
deleted++;
|
||||
if(deleting)
|
||||
{
|
||||
deleted++;
|
||||
deleting=0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue