security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-18 14:17:03 +01:00
Code Activity

g10: Fix the show old policy functionality when changing a TOFU policy.

Browse Source 
* g10/tofu.c (record_binding): Fix the show old policy functionality.

--
Signed-off-by: Neal H. Walfield <neal@g10code.com>
This commit is contained in:
Neal H. Walfield 2016-08-31 11:39:35 +02:00
parent 70df5a8fd7
commit 247eef005c
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
g10/tofu.c
View File

@ -767,10 +767,6 @@ record_binding (tofu_dbs_t dbs, const char *fingerprint, const char *email,
char *fingerprint_pp = format_hexfingerprint (fingerprint, NULL, 0); char *fingerprint_pp = format_hexfingerprint (fingerprint, NULL, 0);
gpg_error_t rc; gpg_error_t rc;
char *err = NULL; char *err = NULL;
/* policy_old needs to be a long and not an enum tofu_policy,
because we pass it by reference to get_single_long_cb2, which
expects a long. */
long policy_old = TOFU_POLICY_NONE;
if (! (policy == TOFU_POLICY_AUTO if (! (policy == TOFU_POLICY_AUTO
|| policy == TOFU_POLICY_GOOD || policy == TOFU_POLICY_GOOD
@ -780,11 +776,17 @@ record_binding (tofu_dbs_t dbs, const char *fingerprint, const char *email,
log_bug ("%s: Bad value for policy (%d)!\n", __func__, policy); log_bug ("%s: Bad value for policy (%d)!\n", __func__, policy);
if (show_old) if (DBG_TRUST || show_old)
{ {
/* Get the old policy. Since this is just for informational /* Get the old policy. Since this is just for informational
* purposes, there is no need to start a transaction or to die * purposes, there is no need to start a transaction or to die
* if there is a failure. */ * if there is a failure. */
/* policy_old needs to be a long and not an enum tofu_policy,
because we pass it by reference to get_single_long_cb2, which
expects a long. */
long policy_old = TOFU_POLICY_NONE;
rc = gpgsql_stepx rc = gpgsql_stepx
(dbs->db, &dbs->s.record_binding_get_old_policy, (dbs->db, &dbs->s.record_binding_get_old_policy,
get_single_long_cb2, &policy_old, &err, get_single_long_cb2, &policy_old, &err,
@ -799,27 +801,26 @@ record_binding (tofu_dbs_t dbs, const char *fingerprint, const char *email,
sqlite3_free (err); sqlite3_free (err);
} }
if (DBG_TRUST)
{
if (policy_old != TOFU_POLICY_NONE) if (policy_old != TOFU_POLICY_NONE)
log_debug ("Changing TOFU trust policy for binding" (show_old ? log_info : log_debug)
("Changing TOFU trust policy for binding"
" <key: %s, user id: %s> from %s to %s.\n", " <key: %s, user id: %s> from %s to %s.\n",
fingerprint, email, fingerprint, show_old ? user_id : email,
tofu_policy_str (policy_old), tofu_policy_str (policy_old),
tofu_policy_str (policy)); tofu_policy_str (policy));
else else
log_debug ("Setting TOFU trust policy for new binding" (show_old ? log_info : log_debug)
("Setting TOFU trust policy for new binding"
" <key: %s, user id: %s> to %s.\n", " <key: %s, user id: %s> to %s.\n",
fingerprint, email, fingerprint, show_old ? user_id : email,
tofu_policy_str (policy)); tofu_policy_str (policy));
}
}
if (policy_old == policy) if (policy_old == policy)
{ {
rc = 0; rc = 0;
goto leave; /* Nothing to do. */ goto leave; /* Nothing to do. */
} }
}
if (opt.dry_run) if (opt.dry_run)
{ {