mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-05 12:31:50 +01:00
* getkey.c (parse_auto_key_locate): Silently strip out duplicates rather
than causing an error.
This commit is contained in:
parent
ac46433052
commit
97b0606a95
@ -1,3 +1,8 @@
|
|||||||
|
2006-03-22 David Shaw <dshaw@jabberwocky.com>
|
||||||
|
|
||||||
|
* getkey.c (parse_auto_key_locate): Silently strip out duplicates
|
||||||
|
rather than causing an error.
|
||||||
|
|
||||||
2006-03-22 Werner Koch <wk@g10code.com>
|
2006-03-22 Werner Koch <wk@g10code.com>
|
||||||
|
|
||||||
* sig-check.c (signature_check2): Changed warning URL to include faq.
|
* sig-check.c (signature_check2): Changed warning URL to include faq.
|
||||||
|
@ -2934,6 +2934,7 @@ parse_auto_key_locate(char *options)
|
|||||||
while((tok=optsep(&options)))
|
while((tok=optsep(&options)))
|
||||||
{
|
{
|
||||||
struct akl *akl,*last;
|
struct akl *akl,*last;
|
||||||
|
int dupe=0;
|
||||||
|
|
||||||
if(tok[0]=='\0')
|
if(tok[0]=='\0')
|
||||||
continue;
|
continue;
|
||||||
@ -2969,16 +2970,20 @@ parse_auto_key_locate(char *options)
|
|||||||
|| (akl->type==AKL_SPEC
|
|| (akl->type==AKL_SPEC
|
||||||
&& strcmp(last->spec->uri,akl->spec->uri)==0)))
|
&& strcmp(last->spec->uri,akl->spec->uri)==0)))
|
||||||
{
|
{
|
||||||
|
dupe=1;
|
||||||
free_akl(akl);
|
free_akl(akl);
|
||||||
return 0;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(!dupe)
|
||||||
|
{
|
||||||
if(last)
|
if(last)
|
||||||
last->next=akl;
|
last->next=akl;
|
||||||
else
|
else
|
||||||
opt.auto_key_locate=akl;
|
opt.auto_key_locate=akl;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user