1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00

* keyedit.c (menu_adduid): 2440bis04 says that multiple attribute packets

on a given key are legal.

* keyserver.c (keyserver_refresh): the fake v3 keyid hack applies to
"mailto" URLs as well since they are also served by pksd.
This commit is contained in:
David Shaw 2002-05-01 22:33:18 +00:00
parent 4735060540
commit 66c8a663a5
3 changed files with 21 additions and 36 deletions

View file

@ -838,13 +838,14 @@ keyserver_refresh(STRLIST users)
int rc,count,fakev3=0;
KEYDB_SEARCH_DESC *desc;
/* If refresh_add_fake_v3_keyids is on and it's a HKP scheme, then
enable fake v3 keyid generation. */
/* If refresh_add_fake_v3_keyids is on and it's a HKP or MAILTO
scheme, then enable fake v3 keyid generation. */
if(opt.keyserver_options.refresh_add_fake_v3_keyids &&
opt.keyserver_scheme &&
(strcasecmp(opt.keyserver_scheme,"x-hkp")==0 ||
strcasecmp(opt.keyserver_scheme,"hkp")==0 ||
strcasecmp(opt.keyserver_scheme,"x-broken-hkp")==0))
strcasecmp(opt.keyserver_scheme,"x-broken-hkp")==0 ||
strcasecmp(opt.keyserver_scheme,"mailto")==0))
fakev3=1;
rc=keyidlist(users,&desc,&count,fakev3);