mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* getkey.c (parse_auto_key_locate): Fix dupe-removal code.
* keyedit.c (menu_backsign): Allow backsigning even if the secret subkey doesn't have a binding signature. * armor.c (radix64_read): Don't report EOF when reading only a pad (=) character. The EOF actually starts after the pad. * gpg.c (main): Make --export, --send-keys, --recv-keys, --refresh-keys, and --fetch-keys follow their arguments from left to right. Suggested by Peter Palfrader.
This commit is contained in:
parent
4fdc6387c3
commit
51e88a5fdb
5 changed files with 41 additions and 20 deletions
|
@ -2947,7 +2947,7 @@ parse_auto_key_locate(char *options)
|
|||
|
||||
while((tok=optsep(&options)))
|
||||
{
|
||||
struct akl *akl,*last;
|
||||
struct akl *akl,*check,*last=NULL;
|
||||
int dupe=0;
|
||||
|
||||
if(tok[0]=='\0')
|
||||
|
@ -2976,13 +2976,13 @@ parse_auto_key_locate(char *options)
|
|||
}
|
||||
|
||||
/* We must maintain the order the user gave us */
|
||||
for(last=opt.auto_key_locate;last && last->next;last=last->next)
|
||||
for(check=opt.auto_key_locate;check;last=check,check=check->next)
|
||||
{
|
||||
/* Check for duplicates */
|
||||
if(last && last->type==akl->type
|
||||
if(check->type==akl->type
|
||||
&& (akl->type!=AKL_SPEC
|
||||
|| (akl->type==AKL_SPEC
|
||||
&& strcmp(last->spec->uri,akl->spec->uri)==0)))
|
||||
&& strcmp(check->spec->uri,akl->spec->uri)==0)))
|
||||
{
|
||||
dupe=1;
|
||||
free_akl(akl);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue