From 754b1c463034a634a678d8efc76c27fd46aad9b9 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Sat, 21 May 2016 12:26:44 +0200 Subject: 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 --- g10/gpgv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'g10/gpgv.c') diff --git a/g10/gpgv.c b/g10/gpgv.c index ea26659f1..f1e994bff 100644 --- a/g10/gpgv.c +++ b/g10/gpgv.c @@ -645,9 +645,10 @@ export_pubkey_buffer (ctrl_t ctrl, const char *keyspec, unsigned int options, } gpg_error_t -tofu_get_policy (PKT_public_key *pk, PKT_user_id *user_id, +tofu_get_policy (ctrl_t ctrl, PKT_public_key *pk, PKT_user_id *user_id, enum tofu_policy *policy) { + (void)ctrl; (void)pk; (void)user_id; (void)policy; -- cgit v1.2.3