ITS#8286 - Add missing matching rules

Add missing matching rules for the cn=config schema elements for:

slapd-null
slapd-relay
slapo-chain

diff --git a/servers/slapd/back-ldap/chain.c b/servers/slapd/back-ldap/chain.c
index 89893a59e31544add6091225ba2ef437970cbb8a..cf28ec988e4925b84e7934b821f12432eab21488 100644 (file)
--- a/servers/slapd/back-ldap/chain.c
+++ b/servers/slapd/back-ldap/chain.c
@@ -1239,12 +1239,14 @@ static ConfigTable chaincfg[] = {
                2, 4, 0, ARG_MAGIC|ARG_BERVAL|CH_CHAINING, chain_cf_gen,
                "( OLcfgOvAt:3.1 NAME 'olcChainingBehavior' "
                        "DESC 'Chaining behavior control parameters (draft-sermersheim-ldap-chaining)' "
+                       "EQUALITY caseIgnoreMatch "
                        "SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL },
 #endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
        { "chain-cache-uri", "TRUE/FALSE",
                2, 2, 0, ARG_MAGIC|ARG_ON_OFF|CH_CACHE_URI, chain_cf_gen,
                "( OLcfgOvAt:3.2 NAME 'olcChainCacheURI' "
                        "DESC 'Enables caching of URIs not present in configuration' "
+                       "EQUALITY booleanMatch "
                        "SYNTAX OMsBoolean SINGLE-VALUE )", NULL, NULL },
        { "chain-max-depth", "args",
                2, 2, 0, ARG_MAGIC|ARG_INT|CH_MAX_DEPTH, chain_cf_gen,
@@ -1257,6 +1259,7 @@ static ConfigTable chaincfg[] = {
                2, 2, 0, ARG_MAGIC|ARG_ON_OFF|CH_RETURN_ERR, chain_cf_gen,
                "( OLcfgOvAt:3.4 NAME 'olcChainReturnError' "
                        "DESC 'Errors are returned instead of the original referral' "
+                       "EQUALITY booleanMatch "
                        "SYNTAX OMsBoolean SINGLE-VALUE )", NULL, NULL },
        { NULL, NULL, 0, 0, 0, ARG_IGNORED }
 };

diff --git a/servers/slapd/back-null/null.c b/servers/slapd/back-null/null.c
index bf43f5494da1e4a2a467898cf04ff64230d583f1..f39664fa74c706c6f86ac1a7cf62a3f6a4177785 100644 (file)
--- a/servers/slapd/back-null/null.c
+++ b/servers/slapd/back-null/null.c
@@ -38,11 +38,13 @@ static ConfigTable nullcfg[] = {
                (void *)offsetof(null_info, ni_bind_allowed),
                "( OLcfgDbAt:8.1 NAME 'olcDbBindAllowed' "
                "DESC 'Allow binds to this database' "
+               "EQUALITY booleanMatch "
                "SYNTAX OMsBoolean SINGLE-VALUE )", NULL, NULL },
        { "dosearch", "true|FALSE", 1, 2, 0, ARG_ON_OFF|ARG_OFFSET,
                (void *)offsetof(null_info, ni_dosearch),
                "( OLcfgDbAt:8.2 NAME 'olcDbDoSearch' "
                "DESC 'Return an entry on searches' "
+               "EQUALITY booleanMatch "
                "SYNTAX OMsBoolean SINGLE-VALUE )", NULL, NULL },
        { NULL, NULL, 0, 0, 0, ARG_IGNORED,
                NULL, NULL, NULL, NULL }

diff --git a/servers/slapd/back-relay/init.c b/servers/slapd/back-relay/init.c
index 10d4338337f1bbf3549690419c246f8b3de0abbc..0bc68e8e58a55d4397bbeb70814aaefba6cec698 100644 (file)
--- a/servers/slapd/back-relay/init.c
+++ b/servers/slapd/back-relay/init.c
@@ -36,6 +36,7 @@ static ConfigTable relaycfg[] = {
                relay_back_cf, "( OLcfgDbAt:5.1 "
                        "NAME 'olcRelay' "
                        "DESC 'Relay DN' "
+                       "EQUALITY distinguishedNameMatch "
                        "SYNTAX OMsDN "
                        "SINGLE-VALUE )",
                NULL, NULL },