diff options
| author | Werner Koch <[email protected]> | 2019-07-09 09:13:51 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2019-07-09 09:22:08 +0000 |
| commit | 3c2cf5ea952015a441ee5701c41dadc63be60d87 (patch) | |
| tree | 52358c7c9b9bb8bef4d97b3865760ad4f2434f4a /g10/import.c | |
| parent | gpg: Fix regression in option "self-sigs-only". (diff) | |
| download | gnupg-3c2cf5ea952015a441ee5701c41dadc63be60d87.tar.gz gnupg-3c2cf5ea952015a441ee5701c41dadc63be60d87.zip | |
gpg: Do not try the import fallback if the options are already used.
* g10/import.c (import_one): Check options.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | g10/import.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/g10/import.c b/g10/import.c index 56fe73aa4..5d3162c5d 100644 --- a/g10/import.c +++ b/g10/import.c @@ -2301,7 +2301,9 @@ import_one (ctrl_t ctrl, from_sk, silent, screener, screener_arg, origin, url, r_valid); if (gpg_err_code (err) == GPG_ERR_TOO_LARGE - && gpg_err_source (err) == GPG_ERR_SOURCE_KEYBOX) + && gpg_err_source (err) == GPG_ERR_SOURCE_KEYBOX + && ((options & (IMPORT_SELF_SIGS_ONLY | IMPORT_CLEAN)) + != (IMPORT_SELF_SIGS_ONLY | IMPORT_CLEAN))) { /* We hit the maximum image length. Ask the wrapper to do * everything again but this time with some extra options. */ |