security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-21 19:48:05 +01:00
Code Activity

g10: End transaction earlier.

Browse Source 
* g10/tofu.c (ask_about_binding): End the transaction earlier.

--
Signed-off-by: Neal H. Walfield <neal@g10code.com>
This commit is contained in:
Neal H. Walfield 2016-09-01 23:31:53 +02:00
parent b410a3cb76
commit 85fad6c34c
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
g10/tofu.c
View File

@ -1414,6 +1414,7 @@ ask_about_binding (ctrl_t ctrl,
" order by fingerprint = ? asc, fingerprint desc, time_ago desc;\n", " order by fingerprint = ? asc, fingerprint desc, time_ago desc;\n",
GPGSQL_ARG_STRING, email, GPGSQL_ARG_STRING, fingerprint, GPGSQL_ARG_STRING, email, GPGSQL_ARG_STRING, fingerprint,
GPGSQL_ARG_END); GPGSQL_ARG_END);
end_transaction (ctrl, 0);
if (rc) if (rc)
{ {
strlist_t strlist_iter; 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) if ((*policy == TOFU_POLICY_NONE && bindings_with_this_email_count > 0)
|| (*policy == TOFU_POLICY_ASK || (*policy == TOFU_POLICY_ASK
&& (conflict || bindings_with_this_email_count > 0))) && (conflict || bindings_with_this_email_count > 0)))