aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--g10/tofu.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/g10/tofu.c b/g10/tofu.c
index e433f79f1..e15b564f7 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -1372,7 +1372,8 @@ ask_about_binding (tofu_dbs_t dbs,
if ((*policy == TOFU_POLICY_NONE && bindings_with_this_email_count > 0)
- || (*policy == TOFU_POLICY_ASK && conflict))
+ || (*policy == TOFU_POLICY_ASK
+ && (conflict || bindings_with_this_email_count > 0)))
{
/* This is a conflict. */