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

* options.h, export.c (parse_export_options, do_export_stream), import.c

Browse source 
(parse_import_options, import_keys_internal): Make the import-options and
export-options distinct since they can be mixed together as part of
keyserver-options.
This commit is contained in:
David Shaw 2004-11-26 15:51:37 +00:00
parent 9a70afe2b3
commit 6dedf7a068
5 changed files with 32 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
g10/g10.c
View file

@ -1655,9 +1655,9 @@ main( int argc, char **argv )
opt.force_v3_sigs = 1;
opt.escape_from = 1;
opt.import_options=IMPORT_SK2PK;
opt.export_options=EXPORT_INCLUDE_ATTRIBUTES;
opt.export_options=EXPORT_ATTRIBUTES;
opt.keyserver_options.import_options=IMPORT_REPAIR_PKS_SUBKEY_BUG;
opt.keyserver_options.export_options=EXPORT_INCLUDE_ATTRIBUTES;
opt.keyserver_options.export_options=EXPORT_ATTRIBUTES;
opt.keyserver_options.options=
KEYSERVER_INCLUDE_SUBKEYS|KEYSERVER_INCLUDE_REVOKED|KEYSERVER_TRY_DNS_SRV|KEYSERVER_HONOR_KEYSERVER_URL;
opt.verify_options=
@ -3254,7 +3254,7 @@ main( int argc, char **argv )
break;
case aFastImport:
opt.import_options |= IMPORT_FAST_IMPORT;
opt.import_options |= IMPORT_FAST;
case aImport:
import_keys( argc? argv:NULL, argc, NULL, opt.import_options );
break;