aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--g10/gpg.c5
-rw-r--r--g10/tofu.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/g10/gpg.c b/g10/gpg.c
index 3193e7426..a9770d74a 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -4664,6 +4664,8 @@ main (int argc, char **argv)
if (! hd)
g10_exit (1);
+ tofu_begin_batch_update (ctrl);
+
for (i = 1; i < argc; i ++)
{
KEYDB_SEARCH_DESC desc;
@@ -4721,8 +4723,9 @@ main (int argc, char **argv)
g10_exit (1);
}
- keydb_release (hd);
+ tofu_end_batch_update (ctrl);
+ keydb_release (hd);
}
#endif /*USE_TOFU*/
break;
diff --git a/g10/tofu.c b/g10/tofu.c
index 137065ad6..4285e960c 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -2584,6 +2584,8 @@ tofu_set_policy (ctrl_t ctrl, kbnode_t kb, enum tofu_policy policy)
fingerprint = hexfingerprint (pk, NULL, 0);
+ begin_transaction (ctrl);
+
for (; kb; kb = kb->next)
{
PKT_user_id *user_id;
@@ -2605,6 +2607,8 @@ tofu_set_policy (ctrl_t ctrl, kbnode_t kb, enum tofu_policy policy)
xfree (email);
}
+ end_transaction (ctrl, 0);
+
xfree (fingerprint);
return 0;
}