diff options
| author | Werner Koch <[email protected]> | 2006-04-28 14:31:29 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2006-04-28 14:31:29 +0000 |
| commit | 00ffc478de4940b9fbbb9f488f545a65ca7d1278 (patch) | |
| tree | 9ec271f1c03397acbd3c6274931ca7a927ae907f /g10/getkey.c | |
| parent | Still merging 1.4.3 code back (diff) | |
| download | gnupg-00ffc478de4940b9fbbb9f488f545a65ca7d1278.tar.gz gnupg-00ffc478de4940b9fbbb9f488f545a65ca7d1278.zip | |
Merged recent changes from 1.4
Diffstat (limited to 'g10/getkey.c')
| -rw-r--r-- | g10/getkey.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/g10/getkey.c b/g10/getkey.c index acd992c21..bff2a0ddc 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -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); |