aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustus Winter <[email protected]>2016-07-21 16:07:22 +0000
committerJustus Winter <[email protected]>2016-07-21 16:07:22 +0000
commit8a6f8e1e397a2d676b211f2dbc6df4a80b67442d (patch)
tree2b2c0a310e14a7fa51f9731a445f6e3802cb793c
parentgpgscm: Make assert macro more accurate. (diff)
downloadgnupg-8a6f8e1e397a2d676b211f2dbc6df4a80b67442d.tar.gz
gnupg-8a6f8e1e397a2d676b211f2dbc6df4a80b67442d.zip
g10: Drop superfluous begin transaction.
* g10/tofu.c (record_binding): We only need a transaction for the split format. Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to '')
-rw-r--r--g10/tofu.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/g10/tofu.c b/g10/tofu.c
index 0b9d84822..847c023f4 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -1199,6 +1199,7 @@ record_binding (tofu_dbs_t dbs, const char *fingerprint, const char *email,
only place where we start two transaction and we always start
transaction on the DB_KEY DB first, thus deadlock is not
possible. */
+ /* We only need a transaction for the split format. */
{
db_key = getdb (dbs, fingerprint, DB_KEY);
if (! db_key)
@@ -1215,13 +1216,6 @@ record_binding (tofu_dbs_t dbs, const char *fingerprint, const char *email,
if (rc)
goto out_revert_one;
}
- else
- {
- rc = begin_transaction (db_email, 1);
- if (rc)
- goto leave;
- }
-
if (show_old)
/* Get the old policy. Since this is just for informational