Remove extensible matching rules for now.

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 8b7e41beb97aee004a63dfdeb4518f9d29cff594..3e874d532b66bf40d943d31024e070292e34b578 100644 (file)
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -10,7 +10,6 @@
 #include <stdio.h>
 
 #include <ac/ctype.h>
-#include <ac/errno.h>
 #include <ac/string.h>
 #include <ac/socket.h>
 
@@ -3316,54 +3315,6 @@ objectIdentifierFirstComponentMatch(
        return rc;
 }
 
-static int
-integerBitAndMatch(
-       int *matchp,
-       slap_mask_t flags,
-       Syntax *syntax,
-       MatchingRule *mr,
-       struct berval *value,
-       void *assertedValue )
-{
-       long lValue, lAssertedValue;
-
-       /* safe to assume integers are NUL terminated? */
-       lValue = strtoul(value->bv_val, NULL, 10);
-       if(( lValue == LONG_MIN || lValue == LONG_MAX) && errno == ERANGE )
-               return LDAP_CONSTRAINT_VIOLATION;
-
-       lAssertedValue = strtol(((struct berval *)assertedValue)->bv_val, NULL, 10);
-       if(( lAssertedValue == LONG_MIN || lAssertedValue == LONG_MAX) && errno == ERANGE )
-               return LDAP_CONSTRAINT_VIOLATION;
-
-       *matchp = (lValue & lAssertedValue);
-       return LDAP_SUCCESS;
-}
-
-static int
-integerBitOrMatch(
-       int *matchp,
-       slap_mask_t flags,
-       Syntax *syntax,
-       MatchingRule *mr,
-       struct berval *value,
-       void *assertedValue )
-{
-       long lValue, lAssertedValue;
-
-       /* safe to assume integers are NUL terminated? */
-       lValue = strtoul(value->bv_val, NULL, 10);
-       if(( lValue == LONG_MIN || lValue == LONG_MAX) && errno == ERANGE )
-               return LDAP_CONSTRAINT_VIOLATION;
-
-       lAssertedValue = strtol(((struct berval *)assertedValue)->bv_val, NULL, 10);
-       if(( lAssertedValue == LONG_MIN || lAssertedValue == LONG_MAX) && errno == ERANGE )
-               return LDAP_CONSTRAINT_VIOLATION;
-
-       *matchp = (lValue | lAssertedValue);
-       return LDAP_SUCCESS;
-}
-
 static int
 check_time_syntax (struct berval *val,
        int start,
@@ -4164,20 +4115,6 @@ struct mrule_defs_rec mrule_defs[] = {
                OpenLDAPaciMatch, NULL, NULL,
                NULL},
 
-       {"( 1.2.840.113556.1.4.803 NAME 'integerBitAndMatch' "
-               "SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )",
-               SLAP_MR_EXT,
-               NULL, NULL,
-               integerBitAndMatch, NULL, NULL,
-               NULL},
-
-       {"( 1.2.840.113556.1.4.804 NAME 'integerBitOrMatch' "
-               "SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )",
-               SLAP_MR_EXT,
-               NULL, NULL,
-               integerBitOrMatch, NULL, NULL,
-               NULL},
-
        {NULL, SLAP_MR_NONE, NULL, NULL, NULL, NULL}
 };