security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

* options.h, g10.c (main), import.c (parse_import_options, import_one,

Browse source 
import_secret_one), keyserver.c (keyserver_refresh): Change --merge-only
to --import-option merge-only.  Deprecate --merge-only.
This commit is contained in:
David Shaw 2003-12-31 04:58:52 +00:00
parent 1228a48ab9
commit 2a785147be
5 changed files with 31 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
g10/keyserver.c
View file

@ -1411,7 +1411,7 @@ keyserver_refresh(STRLIST users)
/* 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;
opt.import_options|=IMPORT_MERGE_ONLY;
/* If refresh_add_fake_v3_keyids is on and it's a HKP or MAILTO
scheme, then enable fake v3 keyid generation. */