diff options
| author | Neal H. Walfield <[email protected]> | 2016-08-30 09:29:52 +0000 |
|---|---|---|
| committer | Neal H. Walfield <[email protected]> | 2016-08-30 13:54:40 +0000 |
| commit | 4c2abb221b29c9e8e0876fe986472b562ee1c99f (patch) | |
| tree | f09d0a86d8407b0c993c9927a453664a8fdc069f | |
| parent | g10: Print the formatted text. (diff) | |
| download | gnupg-4c2abb221b29c9e8e0876fe986472b562ee1c99f.tar.gz gnupg-4c2abb221b29c9e8e0876fe986472b562ee1c99f.zip | |
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 <[email protected]>
| -rw-r--r-- | g10/tofu.c | 3 |
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. */ |