diff --git a/doc/gpg.texi b/doc/gpg.texi index 15b3243d..7eacf1fc 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -2119,7 +2119,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". However, if the actual used source is an LDAP server "no-self-sigs-only" is assumed unless "self-sigs-only" has been explicitly configured. diff --git a/g10/gpg.c b/g10/gpg.c index 2ae3750a..48068a6d 100644 --- a/g10/gpg.c +++ b/g10/gpg.c @@ -2468,8 +2468,7 @@ main (int argc, char **argv) | IMPORT_REPAIR_PKS_SUBKEY_BUG | IMPORT_SELF_SIGS_ONLY | IMPORT_COLLAPSE_UIDS - | IMPORT_COLLAPSE_SUBKEYS - | IMPORT_CLEAN); + | IMPORT_COLLAPSE_SUBKEYS); opt.keyserver_options.export_options = EXPORT_ATTRIBUTES; opt.keyserver_options.options = 0; opt.verify_options = (LIST_SHOW_UID_VALIDITY