re-fix previus commit the other way 'round (rids are < 1000)

[openldap] / servers / slapd / schema_prep.c

diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index 568f9980c77a07e8f6df3c5d6b0ab9db6beeeb1d..43eb1be76687933f097de5ac0881260e74ef5ead 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-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -363,7 +363,7 @@ static struct slap_schema_oc_map {
        { "subschema", "( 2.5.20.1 NAME 'subschema' "
                "DESC 'RFC4512: controlling subschema (sub)entry' "
                "AUXILIARY "
-               "MAY ( dITStructureRules $ nameForms $ ditContentRules $ "
+               "MAY ( dITStructureRules $ nameForms $ dITContentRules $ "
                        "objectClasses $ attributeTypes $ matchingRules $ "
                        "matchingRuleUse ) )",
                subentryObjectClass, SLAP_OC_OPERATIONAL,
@@ -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,
@@ -742,7 +742,7 @@ static struct slap_schema_ad_map {
                offsetof(struct slap_internal_schema, si_ad_subtreeSpecification) },
 
        /* subschema subentry attributes */
-       { "ditStructureRules", "( 2.5.21.1 NAME 'dITStructureRules' "
+       { "dITStructureRules", "( 2.5.21.1 NAME 'dITStructureRules' "
                        "DESC 'RFC4512: DIT structure rules' "
                        "EQUALITY integerFirstComponentMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.17 "
@@ -751,7 +751,7 @@ static struct slap_schema_ad_map {
                NULL, NULL,
                NULL, NULL, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_ditStructureRules) },
-       { "ditContentRules", "( 2.5.21.2 NAME 'dITContentRules' "
+       { "dITContentRules", "( 2.5.21.2 NAME 'dITContentRules' "
                        "DESC 'RFC4512: DIT content rules' "
                        "EQUALITY objectIdentifierFirstComponentMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.16 USAGE directoryOperation )",
@@ -986,18 +986,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' "