diff options
| author | David Shaw <[email protected]> | 2006-04-09 03:34:09 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2006-04-09 03:34:09 +0000 |
| commit | 51e88a5fdb92797c5109d2948c1f6e1c5230e6ad (patch) | |
| tree | e7e0c80e14d0a4a4c27fa41fb9bda7946b06e5ab /g10/getkey.c | |
| parent | Fixed segv (diff) | |
| download | gnupg-51e88a5fdb92797c5109d2948c1f6e1c5230e6ad.tar.gz gnupg-51e88a5fdb92797c5109d2948c1f6e1c5230e6ad.zip | |
* 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.
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 16b34f00f..c9ae58c88 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -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); |