diff options
| author | Neal H. Walfield <[email protected]> | 2016-09-16 13:18:56 +0000 |
|---|---|---|
| committer | Neal H. Walfield <[email protected]> | 2016-09-16 13:35:20 +0000 |
| commit | 221b0bd0e5946edaea7135bc3b6f3c5c0fc6dbca (patch) | |
| tree | 7e6f8c94058e738cb52089b03e8faa12fe5a7f02 | |
| parent | g10: Load the key block if the supplied user id list is NULL. (diff) | |
| download | gnupg-221b0bd0e5946edaea7135bc3b6f3c5c0fc6dbca.tar.gz gnupg-221b0bd0e5946edaea7135bc3b6f3c5c0fc6dbca.zip | |
g10: Don't ignore failure. On failure, rollback.
* g10/tofu.c (tofu_set_policy): If record_binding fails, fail. If the
function fails, rollback the transaction.
--
Signed-off-by: Neal H. Walfield <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | g10/tofu.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/g10/tofu.c b/g10/tofu.c index 9a60223b6..495f7efd4 100644 --- a/g10/tofu.c +++ b/g10/tofu.c @@ -3328,6 +3328,7 @@ tofu_get_validity (ctrl_t ctrl, PKT_public_key *pk, strlist_t user_id_list, gpg_error_t tofu_set_policy (ctrl_t ctrl, kbnode_t kb, enum tofu_policy policy) { + gpg_error_t err; time_t now = gnupg_get_time (); tofu_dbs_t dbs; PKT_public_key *pk; @@ -3370,15 +3371,26 @@ tofu_set_policy (ctrl_t ctrl, kbnode_t kb, enum tofu_policy policy) email = email_from_user_id (user_id->name); - record_binding (dbs, fingerprint, email, user_id->name, policy, 1, now); + err = record_binding (dbs, fingerprint, email, user_id->name, + policy, 1, now); + if (err) + { + log_error (_("error setting policy for key %s, user id \"%s\": %s"), + fingerprint, email, gpg_strerror (err)); + xfree (email); + break; + } xfree (email); } - end_transaction (ctrl, 0); + if (err) + rollback_transaction (ctrl); + else + end_transaction (ctrl, 0); xfree (fingerprint); - return 0; + return err; } /* Set the TOFU policy for all non-revoked user ids in the KEY with |