diff options
Diffstat (limited to 'g10/import.c')
| -rw-r--r-- | g10/import.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/g10/import.c b/g10/import.c index 62ee2a46e..821ddf0d4 100644 --- a/g10/import.c +++ b/g10/import.c @@ -225,12 +225,14 @@ parse_import_options(char *str,unsigned int *options,int noisy) {NULL,0,NULL,NULL} }; int rc; - int saved_self_sigs_only; + int saved_self_sigs_only, saved_import_clean; - /* We need to set a flag indicating wether the user has set - * IMPORT_SELF_SIGS_ONLY or it came from the default. */ + /* We need to set flags indicating wether the user has set certain + * options or if they came from the default. */ saved_self_sigs_only = (*options & IMPORT_SELF_SIGS_ONLY); saved_self_sigs_only &= ~IMPORT_SELF_SIGS_ONLY; + saved_import_clean = (*options & IMPORT_CLEAN); + saved_import_clean &= ~IMPORT_CLEAN; rc = parse_options (str, options, import_opts, noisy); @@ -239,6 +241,12 @@ parse_import_options(char *str,unsigned int *options,int noisy) else *options |= saved_self_sigs_only; + if (rc && (*options & IMPORT_CLEAN)) + opt.flags.expl_import_clean = 1; + else + *options |= saved_import_clean; + + if (rc && (*options & IMPORT_RESTORE)) { /* Alter other options we want or don't want for restore. */ |