Fix certificateListValidate parsing of CRL extensions

[openldap] / servers / slapd / schema_prep.c

diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index ddd08327a3c220e11419387fe27174b2e2a955b8..040120759db672a086489a69b0c48f7ead09e271 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-2009 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -85,9 +85,9 @@ oidValidate(
 
 
 static int objectClassPretty(
-       struct slap_syntax *syntax,
-       struct berval * in,
-       struct berval * out,
+       Syntax *syntax,
+       struct berval *in,
+       struct berval *out,
        void *ctx )
 {
        ObjectClass *oc;
@@ -241,8 +241,8 @@ objectSubClassMatch(
 static int objectSubClassIndexer( 
        slap_mask_t use,
        slap_mask_t mask,
-       struct slap_syntax *syntax,
-       struct slap_matching_rule *mr,
+       Syntax *syntax,
+       MatchingRule *mr,
        struct berval *prefix,
        BerVarray values,
        BerVarray *keysp,
@@ -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,
@@ -532,12 +532,12 @@ static struct slap_schema_ad_map {
                offsetof(struct slap_internal_schema, si_ad_collectiveExclusions) },
 #endif
 
-       { "entryDN", "( 1.3.6.1.4.1.4203.666.1.33 NAME 'entryDN' "   
+       { "entryDN", "( 1.3.6.1.1.20 NAME 'entryDN' "   
                        "DESC 'DN of the entry' "
                        "EQUALITY distinguishedNameMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 "
                        "SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )",
-               NULL, SLAP_AT_HIDE|SLAP_AT_DYNAMIC,
+               NULL, SLAP_AT_DYNAMIC,
                NULL, NULL,
                NULL, NULL, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_entryDN) },
@@ -603,7 +603,7 @@ static struct slap_schema_ad_map {
                        "EQUALITY CSNMatch "
                        "ORDERING CSNOrderingMatch "
                        "SYNTAX 1.3.6.1.4.1.4203.666.11.2.1{64} "
-                       "SINGLE-VALUE NO-USER-MODIFICATION USAGE dSAOperation )",
+                       "NO-USER-MODIFICATION USAGE dSAOperation )",
                NULL, SLAP_AT_HIDE,
                NULL, NULL,
                NULL, NULL, NULL, NULL, NULL,
@@ -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,
@@ -986,18 +988,6 @@ static struct slap_schema_ad_map {
                NULL, NULL, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_authPasswordSchemes) },
 #endif
-#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
-       { "krbName", "( 1.3.6.1.4.1.250.1.32 "
-                       "NAME ( 'krbName' 'kerberosName' ) "
-                       "DESC 'Kerberos principal associated with object' "
-                       "EQUALITY caseIgnoreIA5Match "
-                       "SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 "
-                       "SINGLE-VALUE )",
-               NULL, 0,
-               NULL, NULL,
-               NULL, NULL, NULL, NULL, NULL,
-               offsetof(struct slap_internal_schema, si_ad_krbName) },
-#endif
 
        { "description", "( 2.5.4.13 NAME 'description' "
                        "DESC 'RFC4519: descriptive information' "
@@ -1031,6 +1021,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 */
@@ -1048,6 +1039,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 */
@@ -1082,6 +1074,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 }
 };
 
@@ -1276,7 +1272,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;
                        }
                }