diff options
| author | Neal H. Walfield <[email protected]> | 2016-09-01 21:31:53 +0000 |
|---|---|---|
| committer | Neal H. Walfield <[email protected]> | 2016-09-01 21:32:00 +0000 |
| commit | 85fad6c34c08b2850580e0644faba62d3a501b84 (patch) | |
| tree | b892c4488b47662c3d8d3926d318bd9d42d63323 /g10/tofu.c | |
| parent | g10: Don't consider cross-signed keys to be in conflict. (diff) | |
| download | gnupg-85fad6c34c08b2850580e0644faba62d3a501b84.tar.gz gnupg-85fad6c34c08b2850580e0644faba62d3a501b84.zip | |
g10: End transaction earlier.
* g10/tofu.c (ask_about_binding): End the transaction earlier.
--
Signed-off-by: Neal H. Walfield <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | g10/tofu.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/g10/tofu.c b/g10/tofu.c index 2ac60658b..75df30af6 100644 --- a/g10/tofu.c +++ b/g10/tofu.c @@ -1414,6 +1414,7 @@ ask_about_binding (ctrl_t ctrl, " order by fingerprint = ? asc, fingerprint desc, time_ago desc;\n", GPGSQL_ARG_STRING, email, GPGSQL_ARG_STRING, fingerprint, GPGSQL_ARG_END); + end_transaction (ctrl, 0); if (rc) { strlist_t strlist_iter; @@ -1680,8 +1681,6 @@ ask_about_binding (ctrl_t ctrl, } } - end_transaction (ctrl, 0); - if ((*policy == TOFU_POLICY_NONE && bindings_with_this_email_count > 0) || (*policy == TOFU_POLICY_ASK && (conflict || bindings_with_this_email_count > 0))) |