diff options
| author | David Shaw <[email protected]> | 2002-07-22 22:26:14 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2002-07-22 22:26:14 +0000 |
| commit | 125613737cf7b2e600b782369d40473b1bacb603 (patch) | |
| tree | 7ec067b90bbf1de0ff4c65bc51d6752f44e83db6 /g10/main.h | |
| parent | * options.h, main.h, export.c (parse_export_options, do_export_stream), (diff) | |
| download | gnupg-125613737cf7b2e600b782369d40473b1bacb603.tar.gz gnupg-125613737cf7b2e600b782369d40473b1bacb603.zip | |
* options.h, main.h, g10.c (main), import.c (parse_import_options,
delete_inv_parts), keyserver.c (parse_keyserver_options): add new
--import-options option. The only current flag is "allow-local-sigs".
* g10.c (main): Don't disable MDC in pgp7 mode.
* options.h, g10.c (main), keyserver.c (parse_keyserver_options): Remove
old keyserver-option include-attributes now that there is an export-option
for the same thing.
Diffstat (limited to '')
| -rw-r--r-- | g10/main.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/g10/main.h b/g10/main.h index 4d705b093..05da9c80c 100644 --- a/g10/main.h +++ b/g10/main.h @@ -150,6 +150,11 @@ KBNODE make_comment_node( const char *s ); KBNODE make_mpi_comment_node( const char *s, MPI a ); /*-- import.c --*/ +/* 1, 4, and 8 are reserved so they match the EXPORT_* flags below */ +#define IMPORT_ALLOW_LOCAL_SIGS 2 +#define IMPORT_DEFAULT 0 + +int parse_import_options(char *str,unsigned int *options); void import_keys( char **fnames, int nnames, int fast, void *stats_hd ); int import_keys_stream( IOBUF inp, int fast, void *stats_hd ); void *import_new_stats_handle (void); @@ -159,11 +164,11 @@ void import_print_stats (void *hd); int collapse_uids( KBNODE *keyblock ); /*-- export.c --*/ -#define EXPORT_INCLUDE_NON_RFC 1 -#define EXPORT_INCLUDE_LOCAL_SIGS 2 -#define EXPORT_INCLUDE_ATTRIBUTES 4 +#define EXPORT_INCLUDE_NON_RFC 1 +#define EXPORT_INCLUDE_LOCAL_SIGS 2 +#define EXPORT_INCLUDE_ATTRIBUTES 4 #define EXPORT_INCLUDE_SENSITIVE_REVKEYS 8 -#define EXPORT_DEFAULT (1|4) +#define EXPORT_DEFAULT (1|4) int parse_export_options(char *str,unsigned int *options); int export_pubkeys( STRLIST users, unsigned int options ); |