diff options
| author | David Shaw <[email protected]> | 2003-12-31 04:58:52 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-12-31 04:58:52 +0000 |
| commit | 2a785147be0d0dbec09ea1b63ff5b06d123169b0 (patch) | |
| tree | 28d8b1040eae1fcd1216d8f284372565025ff336 /g10/options.h | |
| parent | * g10m.c: Dead code. Remove. (diff) | |
| download | gnupg-2a785147be0d0dbec09ea1b63ff5b06d123169b0.tar.gz gnupg-2a785147be0d0dbec09ea1b63ff5b06d123169b0.zip | |
* options.h, g10.c (main), import.c (parse_import_options, import_one,
import_secret_one), keyserver.c (keyserver_refresh): Change --merge-only
to --import-option merge-only. Deprecate --merge-only.
Diffstat (limited to 'g10/options.h')
| -rw-r--r-- | g10/options.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/options.h b/g10/options.h index f359a6a2d..c2af79aef 100644 --- a/g10/options.h +++ b/g10/options.h @@ -172,7 +172,6 @@ struct { int show_session_key; int use_agent; const char *gpg_agent_info; - int merge_only; int try_all_secrets; int no_expensive_trust_checks; int no_sig_cache; @@ -207,7 +206,6 @@ struct { #define DBG_EXTPROG_VALUE 1024 /* debug external program calls */ #define DBG_CARD_IO_VALUE 2048 - #define DBG_PACKET (opt.debug & DBG_PACKET_VALUE) #define DBG_FILTER (opt.debug & DBG_FILTER_VALUE) #define DBG_CACHE (opt.debug & DBG_CACHE_VALUE) @@ -216,6 +214,7 @@ struct { #define DBG_EXTPROG (opt.debug & DBG_EXTPROG_VALUE) #define DBG_CARD_IO (opt.debug & DBG_CARD_IO_VALUE) + #define GNUPG (opt.compliance==CO_GNUPG) #define RFC1991 (opt.compliance==CO_RFC1991 || opt.compliance==CO_PGP2) #define RFC2440 (opt.compliance==CO_RFC2440) @@ -230,6 +229,7 @@ struct { #define IMPORT_REPAIR_PKS_SUBKEY_BUG (1<<1) #define IMPORT_FAST_IMPORT (1<<2) #define IMPORT_SK2PK (1<<3) +#define IMPORT_MERGE_ONLY (1<<4) #define EXPORT_INCLUDE_NON_RFC (1<<0) #define EXPORT_INCLUDE_LOCAL_SIGS (1<<1) |