diff options
| author | David Shaw <[email protected]> | 2004-04-15 18:16:17 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-04-15 18:16:17 +0000 |
| commit | d20a79dd07c6e9f69d0d2a9f99fe1a4697a16731 (patch) | |
| tree | f9c6adfbfbc9ebdcff0124d3cc823ee8c6d3da06 /g10/g10.c | |
| parent | * packet.h, getkey.c (fixup_uidnode, merge_selfsigs_subkey): Keep track of (diff) | |
| download | gnupg-d20a79dd07c6e9f69d0d2a9f99fe1a4697a16731.tar.gz gnupg-d20a79dd07c6e9f69d0d2a9f99fe1a4697a16731.zip | |
* options.h, keyserver.c (parse_keyserver_options): Remove duplicate code
from parse_keyserver_options by calling the generic parse_options.
* keyserver.c (keyserver_spawn, keyserver_refresh), g10.c (main), gpgv.c
(main), mainproc.c (check_sig_and_print), import.c (revocation_present):
Change all callers.
Diffstat (limited to 'g10/g10.c')
| -rw-r--r-- | g10/g10.c | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -1436,9 +1436,8 @@ main( int argc, char **argv ) opt.export_options=EXPORT_INCLUDE_ATTRIBUTES; opt.keyserver_options.import_options=IMPORT_REPAIR_PKS_SUBKEY_BUG; opt.keyserver_options.export_options=EXPORT_INCLUDE_ATTRIBUTES; - opt.keyserver_options.include_subkeys=1; - opt.keyserver_options.include_revoked=1; - opt.keyserver_options.try_dns_srv=1; + opt.keyserver_options.options= + KEYSERVER_INCLUDE_SUBKEYS|KEYSERVER_INCLUDE_REVOKED|KEYSERVER_TRY_DNS_SRV; opt.verify_options= VERIFY_SHOW_POLICY_URLS|VERIFY_SHOW_NOTATIONS|VERIFY_SHOW_KEYSERVER_URLS; opt.trust_model=TM_AUTO; @@ -2212,8 +2211,11 @@ main( int argc, char **argv ) case oNoRandomSeedFile: use_random_seed = 0; break; case oAutoKeyRetrieve: case oNoAutoKeyRetrieve: - opt.keyserver_options.auto_key_retrieve= - (pargs.r_opt==oAutoKeyRetrieve); + if(pargs.r_opt==oAutoKeyRetrieve) + opt.keyserver_options.options|=KEYSERVER_AUTO_KEY_RETRIEVE; + else + opt.keyserver_options.options&=~KEYSERVER_AUTO_KEY_RETRIEVE; + deprecated_warning(configname,configlineno, pargs.r_opt==oAutoKeyRetrieve?"--auto-key-retrieve": "--no-auto-key-retrieve","--keyserver-options ", |