diff options
| author | Daniel Kahn Gillmor <[email protected]> | 2019-07-15 20:24:35 +0000 |
|---|---|---|
| committer | Daniel Kahn Gillmor <[email protected]> | 2019-07-15 20:24:35 +0000 |
| commit | be99eec2b105eb5f8e3759147ae351dcc40560ad (patch) | |
| tree | a4a28707d637fd9fa884ff85e736efe63a19e446 | |
| parent | scd: Remove useless GNUPG_SCD_MAIN_HEADER macro. (diff) | |
| download | gnupg-dkg-fix-T4628.tar.gz gnupg-dkg-fix-T4628.zip | |
gpg: drop import-clean from default keyserver import optionsdkg-fix-T4628
* g10/gpg.c (main): drop IMPORT_CLEAN from the
default opt.keyserver_options.import_options
* doc/gpg.texi: reflect this change in the documentation
Given that SELF_SIGS_ONLY is already set, it's not clear what
additional benefit IMPORT_CLEAN provides. Furthermore, IMPORT_CLEAN
means that receiving an OpenPGP certificate from a keyserver will
potentially delete data that is otherwise held in the local keyring,
which is surprising to users who expect retrieval from the keyservers
to be purely additive.
GnuPG-Bug-Id: 4628
Signed-off-by: Daniel Kahn Gillmor <[email protected]>
| -rw-r--r-- | doc/gpg.texi | 2 | ||||
| -rw-r--r-- | g10/gpg.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/doc/gpg.texi b/doc/gpg.texi index 80c7f48f5..2d45e0f29 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -1933,7 +1933,7 @@ are available for all keyserver types, some common options are: @end table -The default list of options is: "self-sigs-only, import-clean, +The default list of options is: "self-sigs-only, repair-keys, repair-pks-subkey-bug, export-attributes, honor-pka-record". @@ -2425,8 +2425,7 @@ main (int argc, char **argv) opt.export_options = EXPORT_ATTRIBUTES; opt.keyserver_options.import_options = (IMPORT_REPAIR_KEYS | IMPORT_REPAIR_PKS_SUBKEY_BUG - | IMPORT_SELF_SIGS_ONLY - | IMPORT_CLEAN); + | IMPORT_SELF_SIGS_ONLY); opt.keyserver_options.export_options = EXPORT_ATTRIBUTES; opt.keyserver_options.options = KEYSERVER_HONOR_PKA_RECORD; opt.verify_options = (LIST_SHOW_UID_VALIDITY |