diff options
| author | Neal H. Walfield <[email protected]> | 2016-10-30 17:54:21 +0000 |
|---|---|---|
| committer | Neal H. Walfield <[email protected]> | 2016-10-30 17:55:58 +0000 |
| commit | 614ca00676bb8ca12b5107fec0e4ef8818445254 (patch) | |
| tree | 41cabd6cea6cf76569c769d8924976212d9dbae6 | |
| parent | gpg: Enable the Issuer Fingerprint from rfc4880bis (diff) | |
| download | gnupg-614ca00676bb8ca12b5107fec0e4ef8818445254.tar.gz gnupg-614ca00676bb8ca12b5107fec0e4ef8818445254.zip | |
g10: Fix bit setting.
* g10/tofu.c (build_conflict_set): Fix bit setting.
--
Signed-off-by: Neal H. Walfield <[email protected]>
Fixes-commit: 1f1f56e606c1cb28eec68c60bd8bcb7ab30805de
| -rw-r--r-- | g10/tofu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/g10/tofu.c b/g10/tofu.c index d437c5a72..6156bcc2d 100644 --- a/g10/tofu.c +++ b/g10/tofu.c @@ -1963,9 +1963,9 @@ build_conflict_set (tofu_dbs_t dbs, const char *fingerprint, const char *email) /* The binding is always expired/revoked if the key is * expired/revoked. */ if (binding_pk->has_expired) - iter->flags &= BINDING_EXPIRED; + iter->flags |= BINDING_EXPIRED; if (binding_pk->flags.revoked) - iter->flags &= BINDING_REVOKED; + iter->flags |= BINDING_REVOKED; /* The binding is also expired/revoked if the user id is * expired/revoked. */ @@ -1986,9 +1986,9 @@ build_conflict_set (tofu_dbs_t dbs, const char *fingerprint, const char *email) found_user_id = 1; if (user_id2->is_revoked) - iter->flags &= BINDING_REVOKED; + iter->flags |= BINDING_REVOKED; if (user_id2->is_expired) - iter->flags &= BINDING_EXPIRED; + iter->flags |= BINDING_EXPIRED; } xfree (email2); |