diff options
author | David Shaw <[email protected]> | 2004-11-26 15:51:37 +0000 |
---|---|---|
committer | David Shaw <[email protected]> | 2004-11-26 15:51:37 +0000 |
commit | 6dedf7a068e617b7d5af94fece868c86f7cdff55 (patch) | |
tree | 0a0d8b0ac74d03cd123ccc9bb38e86c00e9c2e73 /g10/options.h | |
parent | * options.h, export.c (parse_export_options, do_export_stream): Add (diff) | |
download | gnupg-6dedf7a068e617b7d5af94fece868c86f7cdff55.tar.gz gnupg-6dedf7a068e617b7d5af94fece868c86f7cdff55.zip |
* options.h, export.c (parse_export_options, do_export_stream), import.c
(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.
Diffstat (limited to 'g10/options.h')
-rw-r--r-- | g10/options.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/g10/options.h b/g10/options.h index 7f71a7032..e8463f0e8 100644 --- a/g10/options.h +++ b/g10/options.h @@ -245,15 +245,15 @@ struct { names between the IMPORT_ and EXPORT_ flags as they can be mixed in the keyserver-options option. */ -#define IMPORT_ALLOW_LOCAL_SIGS (1<<0) +#define IMPORT_LOCAL_SIGS (1<<0) #define IMPORT_REPAIR_PKS_SUBKEY_BUG (1<<1) -#define IMPORT_FAST_IMPORT (1<<2) +#define IMPORT_FAST (1<<2) #define IMPORT_SK2PK (1<<3) #define IMPORT_MERGE_ONLY (1<<4) -#define EXPORT_INCLUDE_LOCAL_SIGS (1<<0) -#define EXPORT_INCLUDE_ATTRIBUTES (1<<1) -#define EXPORT_INCLUDE_SENSITIVE_REVKEYS (1<<2) +#define EXPORT_LOCAL_SIGS (1<<0) +#define EXPORT_ATTRIBUTES (1<<1) +#define EXPORT_SENSITIVE_REVKEYS (1<<2) #define EXPORT_MINIMAL (1<<3) #define LIST_SHOW_PHOTOS (1<<0) |