diff options
| author | Justus Winter <justus@g10code.com> | 2017-06-13 15:35:01 +0200 |
|---|---|---|
| committer | Justus Winter <justus@g10code.com> | 2017-06-14 09:36:28 +0200 |
| commit | 9b12b45aa5e67d4d422bf75a3879df1d52dbe67f (patch) | |
| tree | db1933787e95085e1dd9457311106fe6f2d2a919 /g10/options.h | |
| parent | gpg: Refactor key checking and fixing. (diff) | |
| download | gnupg2-9b12b45aa5e67d4d422bf75a3879df1d52dbe67f.tar.xz gnupg2-9b12b45aa5e67d4d422bf75a3879df1d52dbe67f.zip | |
gpg: Check and fix keys on import.
* doc/gpg.texi: Document the new import option.
* g10/gpg.c (main): Make the new option default to yes.
* g10/import.c (parse_import_options): Parse the new option.
(import_one): Act on the new option.
* g10/options.h (IMPORT_REPAIR_KEYS): New macro.
GnuPG-bug-id: 2236
Signed-off-by: Justus Winter <justus@g10code.com>
Diffstat (limited to '')
| -rw-r--r-- | g10/options.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/g10/options.h b/g10/options.h index 8d1d93e3d..98417d7df 100644 --- a/g10/options.h +++ b/g10/options.h @@ -346,6 +346,7 @@ EXTERN_UNLESS_MAIN_MODULE int memory_stat_debug_mode; #define IMPORT_KEEP_OWNERTTRUST (1<<8) #define IMPORT_EXPORT (1<<9) #define IMPORT_RESTORE (1<<10) +#define IMPORT_REPAIR_KEYS (1<<11) #define EXPORT_LOCAL_SIGS (1<<0) #define EXPORT_ATTRIBUTES (1<<1) |