fix previous commit (ITS#5819)

[openldap] / servers / slapd / schema_prep.c

diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index 12bd1d9d869f09278275ddf7c275fa2cc536ef0d..28bcc96c1debd61e3f804f43783a754e1263ee83 100644 (file)
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -690,7 +690,7 @@ static struct slap_schema_ad_map {
                NULL, NULL,
                NULL, NULL, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_monitorContext) },
-       { "configContext", "( 1.3.6.1.4.1.4203.666.11.1.1 "
+       { "configContext", "( 1.3.6.1.4.1.4203.1.12.2.1 "
                        "NAME 'configContext' "
                        "DESC 'config context' "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 "
@@ -1019,6 +1019,7 @@ static AttributeType slap_at_undefined = {
        NULL, /* syntax (will be set later to "octetString") */
        NULL, /* schema check function */
        NULL, /* oidmacro */
+       NULL, /* soidmacro */
        SLAP_AT_ABSTRACT|SLAP_AT_FINAL, /* mask */
        { NULL }, /* next */
        NULL /* attribute description */
@@ -1036,6 +1037,7 @@ static AttributeType slap_at_proxied = {
        NULL, /* syntax (will be set later to "octetString") */
        NULL, /* schema check function */
        NULL, /* oidmacro */
+       NULL, /* soidmacro */
        SLAP_AT_ABSTRACT|SLAP_AT_FINAL, /* mask */
        { NULL }, /* next */
        NULL /* attribute description */
@@ -1070,6 +1072,10 @@ static struct slap_schema_mr_map {
        { "objectIdentifierFirstComponentMatch",
                offsetof(struct slap_internal_schema,
                        si_mr_objectIdentifierFirstComponentMatch) },
+       { "caseIgnoreMatch",
+               offsetof(struct slap_internal_schema, si_mr_caseIgnoreMatch) },
+       { "caseIgnoreListMatch",
+               offsetof(struct slap_internal_schema, si_mr_caseIgnoreListMatch) },
        { NULL, 0 }
 };
 
@@ -1264,7 +1270,6 @@ slap_schema_load( void )
                                        mr->smr_filter = ad_map[i].ssam_mr_filter;
                                }
 
-                               /* FIXME: no-one will free this at exit */
                                (*adp)->ad_type->sat_equality = mr;
                        }
                }