diff options
| author | David Shaw <[email protected]> | 2002-07-24 21:17:19 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2002-07-24 21:17:19 +0000 |
| commit | 553ac3f08c996f38ddb652aa58cd5b583c347d76 (patch) | |
| tree | 3db239e8bcffdf2b659bfa08bd86fac4c8ffe77c /g10/main.h | |
| parent | * options.h, exec.h, exec.c (set_exec_path, exec_write), g10.c (main), (diff) | |
| download | gnupg-553ac3f08c996f38ddb652aa58cd5b583c347d76.tar.gz gnupg-553ac3f08c996f38ddb652aa58cd5b583c347d76.zip | |
* main.h, import.c (parse_import_options, fix_hkp_corruption, import_one,
delete_inv_parts), g10.c (main): New import-option
"repair-hkp-subkey-bug", which repairs as much as possible the HKP
mangling multiple subkeys bug. It is on by default for keyserver
receives, and off by default for regular --import.
* main.h, import.c (import, import_one, delete_inv_parts), hkp.c
(hkp_ask_import), keyserver.c (keyserver_spawn): Use keyserver import
options when doing keyserver receives.
Diffstat (limited to 'g10/main.h')
| -rw-r--r-- | g10/main.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/g10/main.h b/g10/main.h index 05da9c80c..9edccaf21 100644 --- a/g10/main.h +++ b/g10/main.h @@ -150,13 +150,14 @@ 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 +#define IMPORT_ALLOW_LOCAL_SIGS 1 +#define IMPORT_REPAIR_HKP_SUBKEY_BUG 2 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_keys( char **fnames, int nnames, int fast, + void *stats_hd, unsigned int options ); +int import_keys_stream( IOBUF inp, int fast, + void *stats_hd, unsigned int options ); void *import_new_stats_handle (void); void import_release_stats_handle (void *p); void import_print_stats (void *hd); @@ -168,7 +169,6 @@ int collapse_uids( KBNODE *keyblock ); #define EXPORT_INCLUDE_LOCAL_SIGS 2 #define EXPORT_INCLUDE_ATTRIBUTES 4 #define EXPORT_INCLUDE_SENSITIVE_REVKEYS 8 -#define EXPORT_DEFAULT (1|4) int parse_export_options(char *str,unsigned int *options); int export_pubkeys( STRLIST users, unsigned int options ); |