security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-05-31 22:18:03 +02:00
Code Activity

* getkey.c (parse_auto_key_locate): Silently strip out duplicates rather

Browse Source 
than causing an error.
This commit is contained in:
David Shaw 2006-03-22 23:05:32 +00:00
parent ac46433052
commit 97b0606a95
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -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>
* sig-check.c (signature_check2): Changed warning URL to include faq.

15
g10/getkey.c
View File

@ -2934,6 +2934,7 @@ parse_auto_key_locate(char *options)
while((tok=optsep(&options)))
{
struct akl *akl,*last;
int dupe=0;
if(tok[0]=='\0')
continue;
@ -2969,15 +2970,19 @@ parse_auto_key_locate(char *options)
|| (akl->type==AKL_SPEC
&& strcmp(last->spec->uri,akl->spec->uri)==0)))
{
dupe=1;
free_akl(akl);
return 0;
break;
}
}
if(last)
last->next=akl;
else
opt.auto_key_locate=akl;
if(!dupe)
{
if(last)
last->next=akl;
else
opt.auto_key_locate=akl;
}
}
return 1;