diff options
| author | David Shaw <[email protected]> | 2003-12-31 04:58:52 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-12-31 04:58:52 +0000 |
| commit | 2a785147be0d0dbec09ea1b63ff5b06d123169b0 (patch) | |
| tree | 28d8b1040eae1fcd1216d8f284372565025ff336 /g10/keyserver.c | |
| parent | * g10m.c: Dead code. Remove. (diff) | |
| download | gnupg-2a785147be0d0dbec09ea1b63ff5b06d123169b0.tar.gz gnupg-2a785147be0d0dbec09ea1b63ff5b06d123169b0.zip | |
* options.h, g10.c (main), import.c (parse_import_options, import_one,
import_secret_one), keyserver.c (keyserver_refresh): Change --merge-only
to --import-option merge-only. Deprecate --merge-only.
Diffstat (limited to '')
| -rw-r--r-- | g10/keyserver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/keyserver.c b/g10/keyserver.c index d7843b271..3c8a769d2 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -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. */ |