From 4c2abb221b29c9e8e0876fe986472b562ee1c99f Mon Sep 17 00:00:00 2001 From: "Neal H. Walfield" Date: Tue, 30 Aug 2016 11:29:52 +0200 Subject: g10: Print the info text in more situations. * g10/tofu.c (ask_about_binding): Print the info text when the policy is ask and there are multiple bindings with the email address. -- Signed-off-by: Neal H. Walfield --- g10/tofu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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. */ -- cgit v1.2.3