chiark
/
gitweb
/
~ian
/
gnupg2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gpg: If there is a TOFU conflict, elide the too few message warning.
[gnupg2.git]
/
g10
/
tofu.c
diff --git
a/g10/tofu.c
b/g10/tofu.c
index fc03c5a7dc8ca19d46e6a1e55a08f9eef5fd46c0..41bdd5f30a68239f4d6ec8be109c43ff45765bdc 100644
(file)
--- a/
g10/tofu.c
+++ b/
g10/tofu.c
@@
-3694,6
+3694,7
@@
tofu_get_validity (ctrl_t ctrl, PKT_public_key *pk, strlist_t user_id_list,
int bindings = 0;
int bindings_valid = 0;
int need_warning = 0;
int bindings = 0;
int bindings_valid = 0;
int need_warning = 0;
+ int had_conflict = 0;
dbs = opendbs (ctrl);
if (! dbs)
dbs = opendbs (ctrl);
if (! dbs)
@@
-3762,6
+3763,7
@@
tofu_get_validity (ctrl_t ctrl, PKT_public_key *pk, strlist_t user_id_list,
* key. */
log_assert (conflict_set);
* key. */
log_assert (conflict_set);
+ had_conflict = 1;
for (iter = conflict_set; iter; iter = iter->next)
show_statistics (dbs, iter->d, email,
TOFU_POLICY_ASK, NULL, 1, now);
for (iter = conflict_set; iter; iter = iter->next)
show_statistics (dbs, iter->d, email,
TOFU_POLICY_ASK, NULL, 1, now);
@@
-3794,7
+3796,7
@@
tofu_get_validity (ctrl_t ctrl, PKT_public_key *pk, strlist_t user_id_list,
xfree (email);
}
xfree (email);
}
- if (need_warning)
+ if (need_warning
&& ! had_conflict
)
show_warning (fingerprint, user_id_list);
die:
show_warning (fingerprint, user_id_list);
die: