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

Merged recent changes from 1.4

Browse source
This commit is contained in:
Werner Koch 2006-04-28 14:31:29 +00:00
parent 4459fcb032
commit 00ffc478de
15 changed files with 341 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

8
g10/getkey.c
View file

@ -2948,7 +2948,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')
@ -2977,13 +2977,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);