diff options
| author | Werner Koch <[email protected]> | 2016-05-21 10:26:44 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-05-21 10:26:44 +0000 |
| commit | 754b1c463034a634a678d8efc76c27fd46aad9b9 (patch) | |
| tree | f83aa8b328058ebc57a016f0a854009f5cffc2cf /g10/keyedit.c | |
| parent | gpg: Pass CTRL object down to the trust functions (diff) | |
| download | gnupg-754b1c463034a634a678d8efc76c27fd46aad9b9.tar.gz gnupg-754b1c463034a634a678d8efc76c27fd46aad9b9.zip | |
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]>
Diffstat (limited to 'g10/keyedit.c')
| -rw-r--r-- | g10/keyedit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/keyedit.c b/g10/keyedit.c index c7288b2da..c78f8a3b5 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -3485,7 +3485,7 @@ show_key_with_all_names_colon (ctrl_t ctrl, estream_t fp, kbnode_t keyblock) { #ifdef USE_TOFU enum tofu_policy policy; - if (! tofu_get_policy (primary, uid, &policy) + if (! tofu_get_policy (ctrl, primary, uid, &policy) && policy != TOFU_POLICY_NONE) es_fprintf (fp, "%s", tofu_policy_str (policy)); #endif /*USE_TOFU*/ |