Fix OpenLDAP ITS#3782 - broken logic in bitwise matching rules

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 8d3feb8874eebf57f037044e92853e069c87527d..0ce73bb9b399ef77e71abbfb713e3ebb4d0b0669 100644 (file)
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -2321,7 +2321,7 @@ integerBitAndMatch(
                return LDAP_CONSTRAINT_VIOLATION;
        }
 
-       *matchp = (lValue & lAssertedValue) ? 0 : 1;
+       *matchp = ((lValue & lAssertedValue) == lAssertedValue) ? 0 : 1;
        return LDAP_SUCCESS;
 }
 
@@ -2352,7 +2352,7 @@ integerBitOrMatch(
                return LDAP_CONSTRAINT_VIOLATION;
        }
 
-       *matchp = (lValue | lAssertedValue) ? 0 : -1;
+       *matchp = ((lValue & lAssertedValue) != 0) ? 0 : -1;
        return LDAP_SUCCESS;
 }