mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* 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.
This commit is contained in:
parent
9a70afe2b3
commit
6dedf7a068
5 changed files with 32 additions and 19 deletions
|
@ -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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue