[Pkg-gnupg-commit] [gnupg2] 189/292: g10: Fix bit setting.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 614ca00676bb8ca12b5107fec0e4ef8818445254
Author: Neal H. Walfield <neal at g10code.com>
Date:   Sun Oct 30 10:54:21 2016 -0700

    g10: Fix bit setting.
    
    * g10/tofu.c (build_conflict_set): Fix bit setting.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>
    Fixes-commit: 1f1f56e606c1cb28eec68c60bd8bcb7ab30805de
---
 g10/tofu.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/g10/tofu.c b/g10/tofu.c
index d437c5a..6156bcc 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);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git