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/options.h | |
| 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 '')
| -rw-r--r-- | g10/options.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/g10/options.h b/g10/options.h index 06fd6ba89..a0313b13f 100644 --- a/g10/options.h +++ b/g10/options.h @@ -136,14 +136,7 @@ struct struct { int verbose; - int include_revoked; - int include_disabled; - int include_subkeys; - int use_temp_files; - int keep_temp_files; - int fake_v3_keyids; - int auto_key_retrieve; - int try_dns_srv; + unsigned int options; unsigned int import_options; unsigned int export_options; STRLIST other; @@ -266,4 +259,13 @@ struct #define VERIFY_SHOW_VALIDITY (1<<4) #define VERIFY_SHOW_UNUSABLE_UIDS (1<<5) +#define KEYSERVER_INCLUDE_REVOKED (1<<0) +#define KEYSERVER_INCLUDE_DISABLED (1<<1) +#define KEYSERVER_INCLUDE_SUBKEYS (1<<2) +#define KEYSERVER_USE_TEMP_FILES (1<<3) +#define KEYSERVER_KEEP_TEMP_FILES (1<<4) +#define KEYSERVER_ADD_FAKE_V3 (1<<5) +#define KEYSERVER_AUTO_KEY_RETRIEVE (1<<6) +#define KEYSERVER_TRY_DNS_SRV (1<<7) + #endif /*G10_OPTIONS_H*/ |