Merge remote-tracking branch 'origin/mdb.master'

[openldap] / servers / slapd / schema_prep.c

diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index b4999b958b75090bd9baf0e1ff18ef1655482643..0a4d1654af78c89a3223bbf3682311496ea67f96 100644 (file)
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2012 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -449,7 +449,7 @@ static struct slap_schema_ad_map {
                        "EQUALITY objectIdentifierMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 "
                        "SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )",
-               NULL, SLAP_AT_MANAGEABLE,
+               NULL, 0,
                oidValidate, objectClassPretty,
                NULL, NULL, objectSubClassMatch,
                        objectSubClassIndexer, objectSubClassFilter,
@@ -684,16 +684,18 @@ static struct slap_schema_ad_map {
                        "NAME 'monitorContext' "
                        "DESC 'monitor context' "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 "
+                       "EQUALITY distinguishedNameMatch "
                        "SINGLE-VALUE NO-USER-MODIFICATION "
                        "USAGE dSAOperation )",
                rootDseAttribute, SLAP_AT_HIDE,
                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 "
+                       "EQUALITY distinguishedNameMatch "
                        "SINGLE-VALUE NO-USER-MODIFICATION "
                        "USAGE dSAOperation )",
                rootDseAttribute, SLAP_AT_HIDE,
@@ -932,6 +934,7 @@ static struct slap_schema_ad_map {
                "DESC 'RFC2307: An integer uniquely identifying a user "
                                "in an administrative domain' "
                "EQUALITY integerMatch "
+               "ORDERING integerOrderingMatch "
                "SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )",
                NULL, 0,
                NULL, NULL,
@@ -942,6 +945,7 @@ static struct slap_schema_ad_map {
                "DESC 'RFC2307: An integer uniquely identifying a group "
                                "in an administrative domain' "
                "EQUALITY integerMatch "
+               "ORDERING integerOrderingMatch "
                "SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )",
                NULL, 0,
                NULL, NULL,
@@ -1019,6 +1023,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 +1041,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 +1076,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 }
 };
 
@@ -1151,6 +1161,7 @@ slap_schema_load( void )
        slap_at_proxied.sat_syntax = slap_schema.si_syn_octetString;
        slap_schema.si_at_proxied = &slap_at_proxied;
 
+       ldap_pvt_thread_mutex_init( &ad_index_mutex );
        ldap_pvt_thread_mutex_init( &ad_undef_mutex );
        ldap_pvt_thread_mutex_init( &oc_undef_mutex );
 
@@ -1264,7 +1275,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;
                        }
                }