diff options
| author | David Shaw <dshaw@jabberwocky.com> | 2002-07-24 23:17:19 +0200 |
|---|---|---|
| committer | David Shaw <dshaw@jabberwocky.com> | 2002-07-24 23:17:19 +0200 |
| commit | 553ac3f08c996f38ddb652aa58cd5b583c347d76 (patch) | |
| tree | 3db239e8bcffdf2b659bfa08bd86fac4c8ffe77c /g10/g10.c | |
| parent | * options.h, exec.h, exec.c (set_exec_path, exec_write), g10.c (main), (diff) | |
| download | gnupg2-553ac3f08c996f38ddb652aa58cd5b583c347d76.tar.xz gnupg2-553ac3f08c996f38ddb652aa58cd5b583c347d76.zip | |
* main.h, import.c (parse_import_options, fix_hkp_corruption, import_one,
delete_inv_parts), g10.c (main): New import-option
"repair-hkp-subkey-bug", which repairs as much as possible the HKP
mangling multiple subkeys bug. It is on by default for keyserver
receives, and off by default for regular --import.
* main.h, import.c (import, import_one, delete_inv_parts), hkp.c
(hkp_ask_import), keyserver.c (keyserver_spawn): Use keyserver import
options when doing keyserver receives.
Diffstat (limited to 'g10/g10.c')
| -rw-r--r-- | g10/g10.c | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -906,10 +906,12 @@ main( int argc, char **argv ) opt.pgp2_workarounds = 1; opt.force_v3_sigs = 1; opt.escape_from = 1; - opt.import_options=IMPORT_DEFAULT; - opt.export_options=EXPORT_DEFAULT; - opt.keyserver_options.import_options=IMPORT_DEFAULT; - opt.keyserver_options.export_options=EXPORT_DEFAULT; + opt.import_options=0; + opt.export_options= + EXPORT_INCLUDE_NON_RFC|EXPORT_INCLUDE_ATTRIBUTES; + opt.keyserver_options.import_options=IMPORT_REPAIR_HKP_SUBKEY_BUG; + opt.keyserver_options.export_options= + EXPORT_INCLUDE_NON_RFC|EXPORT_INCLUDE_ATTRIBUTES; opt.keyserver_options.include_subkeys=1; #if defined (__MINGW32__) || defined (__CYGWIN32__) opt.homedir = read_w32_registry_string( NULL, "Software\\GNU\\GnuPG", "HomeDir" ); @@ -2027,7 +2029,8 @@ main( int argc, char **argv ) case aFastImport: case aImport: - import_keys( argc? argv:NULL, argc, (cmd == aFastImport), NULL ); + import_keys( argc? argv:NULL, argc, (cmd == aFastImport), + NULL, opt.import_options ); break; case aExport: |