gpg: Store the Tofu meta handle for databases in CTRL.

* g10/gpg.h (struct tofu_dbs_s, tofu_dbs_t): New declarations.
(struct server_control_s): Add field tofu.dbs.
* g10/tofu.c (struct dbs): Rename to tofu_dbs_s.  Replace all users by
by tofu_dbs_t.
(opendbs):  Add arg CTRL.  Cache the DBS in CTRL.
(closedbs): Rename to tofu_closedbs and make global.  Add arg CTRL.
(tofu_register): Add arg CTRL.  Change all callers.  Do not call
closedbs.
(tofu_get_validity): Ditto.
(tofu_set_policy): Ditto.
(tofu_get_policy): Ditto.
(tofu_set_policy_by_keyid): Add arg CTRL.
* g10/gpg.c (gpg_deinit_default_ctrl): Call tofu_closedbs.

Signed-off-by: Werner Koch <[email protected]>

1 files changed, 2 insertions, 1 deletions

diff --git a/g10/gpg.c b/g10/gpg.c
index 3e0ae3f4f..f901bbd11 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -2046,6 +2046,7 @@ gpg_init_default_ctrl (ctrl_t ctrl)
 static void
 gpg_deinit_default_ctrl (ctrl_t ctrl)
 {
+  tofu_closedbs (ctrl);
   gpg_dirmngr_deinit_session_data (ctrl);
 }
 
@@ -4586,7 +4587,7 @@ main (int argc, char **argv)
 		}
 
 	      merge_keys_and_selfsig (kb);
-	      if (tofu_set_policy (kb, policy))
+	      if (tofu_set_policy (ctrl, kb, policy))
 		g10_exit (1);
 	    }