ComponentFilterMatch support for userCertificate

[openldap] / servers / slapd / schema_init.c

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 8c6e5fef6f0b648e018380a55ca81c4dde4e8371..0c87aadb5900dce199ca1595d925299eeae94e27 100644 (file)
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -3075,11 +3075,8 @@ static slap_syntax_defs_rec syntax_defs[] = {
 #ifdef LDAP_COMP_MATCH
         {"( 1.2.36.79672281.1.5.3 DESC 'allComponents' )",
                 0, allComponentsValidate, NULL},
-       {"( 1.2.36.79672281.1.5.2 DESC 'componentFilter') ",
+       {"( 1.2.36.79672281.1.5.2 DESC 'componentFilterMatch assertion') ",
                0, componentFilterValidate, NULL},
-       {"( 1.3.6.1.4.1.4203.666.2.7 DESC 'componentCertificate' "
-               X_BINARY X_NOT_H_R ")",
-               SLAP_SYNTAX_BINARY|SLAP_SYNTAX_BER, componentCertificateValidate, NULL},
 #endif
        {"( 1.3.6.1.4.1.1466.115.121.1.13 DESC 'Data Quality' )",
                0, NULL, NULL},
@@ -3209,6 +3206,12 @@ char *certificateExactMatchSyntaxes[] = {
        "1.3.6.1.4.1.1466.115.121.1.8" /* certificate */,
        NULL
 };
+#ifdef LDAP_COMP_MATCH
+char *componentFilterMatchSyntaxes[] = {
+       "1.3.6.1.4.1.1466.115.121.1.8" /* certificate */,
+       NULL
+};
+#endif
 char *directoryStringSyntaxes[] = {
        "1.3.6.1.4.1.1466.115.121.1.44" /* printableString */,
        NULL
@@ -3325,7 +3328,7 @@ static slap_mrule_defs_rec mrule_defs[] = {
 #ifdef LDAP_COMP_MATCH
        {"( 1.2.36.79672281.1.13.2 NAME 'componentFilterMatch' "
                "SYNTAX 1.2.36.79672281.1.5.2 )",
-               SLAP_MR_EXT|SLAP_MR_COMPONENT, NULL,
+               SLAP_MR_EXT|SLAP_MR_COMPONENT, componentFilterMatchSyntaxes,
                NULL, NULL , componentFilterMatch,
                octetStringIndexer, octetStringFilter,
                NULL },
@@ -3336,12 +3339,6 @@ static slap_mrule_defs_rec mrule_defs[] = {
                 NULL, NULL , allComponentsMatch,
                 octetStringIndexer, octetStringFilter,
                 NULL },
-       {"( 1.3.6.1.4.1.4203.666.4.12 NAME 'componentCertificateMatch' "
-               "SYNTAX 1.3.6.1.4.1.4203.666.2.7 )",
-               SLAP_MR_EXT|SLAP_MR_COMPONENT, NULL,
-               NULL, NULL , componentCertificateMatch,
-               octetStringIndexer, octetStringFilter,
-               NULL },
 #endif
 
        {"( 2.5.13.2 NAME 'caseIgnoreMatch' "