mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-23 10:29:58 +01:00
* keyserver.c (keyserver_refresh): --refresh-keys implies --merge-only so
as not to import keys with keyids that match the ones being refreshed. Noted by Florian Weimer.
This commit is contained in:
parent
d89cf26621
commit
ab59f621d6
@ -1,3 +1,9 @@
|
||||
2002-05-05 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* keyserver.c (keyserver_refresh): --refresh-keys implies
|
||||
--merge-only so as not to import keys with keyids that match the
|
||||
ones being refreshed. Noted by Florian Weimer.
|
||||
|
||||
2002-05-04 Stefan Bellon <sbellon@sbellon.de>
|
||||
|
||||
* free-packet.c (copy_public_key): Don't call m_alloc(0), therefore
|
||||
|
@ -838,6 +838,11 @@ keyserver_refresh(STRLIST users)
|
||||
int rc,count,fakev3=0;
|
||||
KEYDB_SEARCH_DESC *desc;
|
||||
|
||||
/* We switch merge_only on during a refresh, as 'refresh' should
|
||||
never import new keys, even if their keyids match. Is it worth
|
||||
preserving the old merge_only value here? */
|
||||
opt.merge_only=1;
|
||||
|
||||
/* 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 &&
|
||||
|
Loading…
x
Reference in New Issue
Block a user