gpg: Do not try the import fallback if the options are already used.
authorWerner Koch <wk@gnupg.org>
Tue, 9 Jul 2019 09:13:51 +0000 (11:13 +0200)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Fri, 1 Jul 2022 16:06:43 +0000 (17:06 +0100)
commit0b3fc03798228119daea4a1808ffab09ee64bf08
treebd88f2d30ab078e5bc387296737c31e935a69a73
parent9a2326634c8c5fa9b5730fae2aa86f7bb43bd9d2
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 <wk@gnupg.org>
(cherry picked from commit 3c2cf5ea952015a441ee5701c41dadc63be60d87)

Gbp-Pq: Topic from-2.2.17
Gbp-Pq: Name gpg-Do-not-try-the-import-fallback-if-the-options-are-alr.patch
g10/import.c