X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fschema_prep.c;h=48d00a9df324972e79b1c75502b030ef1ccbca45;hb=89127c93d02d547e89e767af0736ac6d2ebab90d;hp=b9bf64226eb6ad594e3cd3f703dd6487fe42839e;hpb=4b48c05a8e1b9ed776a4bee10ee91986941105de;p=openldap

diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index b9bf64226e..48d00a9df3 100644
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -1,7 +1,7 @@
 /* schema_init.c - init builtin schema */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -28,14 +28,15 @@ static int objectClassNormalize(
 	struct slap_syntax *syntax, /* NULL if in is asserted value */
 	struct slap_matching_rule *mr,
 	struct berval * in,
-	struct berval * out )
+	struct berval * out,
+	void *ctx )
 {
 	ObjectClass *oc = oc_bvfind( in );
 
 	if( oc != NULL ) {
-		ber_dupbv( out, &oc->soc_cname );
+		ber_dupbv_x( out, &oc->soc_cname, ctx );
 	} else {
-		ber_dupbv( out, in );
+		ber_dupbv_x( out, in, ctx );
 	}
 
 #if OCDEBUG
@@ -90,7 +91,8 @@ objectSubClassMatch(
 		return SLAPD_COMPARE_UNDEFINED;
 	}
 
-	if( SLAP_IS_MR_VALUE_SYNTAX_MATCH( flags ) ) {
+	if( SLAP_MR_IS_VALUE_OF_ATTRIBUTE_SYNTAX( flags ) )
+	{
 		*matchp = ( asserted != oc );
 	} else {
 		*matchp = !is_object_subclass( asserted, oc );
@@ -117,7 +119,8 @@ static int objectSubClassIndexer(
 	struct slap_matching_rule *mr,
 	struct berval *prefix,
 	BerVarray values,
-	BerVarray *keysp )
+	BerVarray *keysp,
+	void *ctx )
 {
 	int rc, noc, i;
 	BerVarray ocvalues;
@@ -127,7 +130,7 @@ static int objectSubClassIndexer(
 	}
 
 	/* over allocate */
-	ocvalues = ch_malloc( sizeof( struct berval ) * (noc+16) );
+	ocvalues = sl_malloc( sizeof( struct berval ) * (noc+16), ctx );
 
 	/* copy listed values (and termination) */
 	for( i=0; i<noc; i++ ) {
@@ -184,8 +187,8 @@ static int objectSubClassIndexer(
 			}
 
 			if( !found ) {
-				ocvalues = ch_realloc( ocvalues,
-					sizeof( struct berval ) * (noc+2) );
+				ocvalues = sl_realloc( ocvalues,
+					sizeof( struct berval ) * (noc+2), ctx );
 
 				assert( k == noc );
 
@@ -225,9 +228,9 @@ static int objectSubClassIndexer(
 #endif
 
 	rc = octetStringIndexer( use, mask, syntax, mr,
-		prefix, ocvalues, keysp );
+		prefix, ocvalues, keysp, ctx );
 
-	ch_free( ocvalues );
+	sl_free( ocvalues, ctx );
 	return rc;
 }
 
@@ -239,7 +242,8 @@ static int objectSubClassFilter(
 	MatchingRule *mr,
 	struct berval *prefix,
 	void * assertedValue,
-	BerVarray *keysp )
+	BerVarray *keysp,
+	void *ctx )
 {
 #if OCDEBUG
 	struct berval *bv = (struct berval *) assertedValue;
@@ -258,7 +262,7 @@ static int objectSubClassFilter(
 #endif
 
 	return octetStringFilter( use, flags, syntax, mr,
-		prefix, assertedValue, keysp );
+		prefix, assertedValue, keysp, ctx );
 }
 
 static ObjectClassSchemaCheckFN rootDseObjectClass;
@@ -301,7 +305,7 @@ static struct slap_schema_oc_map {
 			"SUP top STRUCTURAL MAY cn )",
 		rootDseObjectClass, SLAP_OC_OPERATIONAL,
 		offsetof(struct slap_internal_schema, si_oc_rootdse) },
-	{ "subentry", "( 2.5.20.0 NAME 'subentry' "
+	{ "subentry", "( 2.5.17.0 NAME 'subentry' "
 			"SUP top STRUCTURAL "
 			"MUST ( cn $ subtreeSpecification ) )",
 		subentryObjectClass, SLAP_OC_SUBENTRY|SLAP_OC_OPERATIONAL,
@@ -314,13 +318,8 @@ static struct slap_schema_oc_map {
 			"matchingRuleUse ) )",
 		subentryObjectClass, SLAP_OC_OPERATIONAL,
 		offsetof(struct slap_internal_schema, si_oc_subschema) },
-	{ "monitor", "( 1.3.6.1.4.1.4203.666.3.2 NAME 'monitor' "
-		"DESC 'OpenLDAP system monitoring' "
-		"STRUCTURAL "
-		"MUST cn )",
-		0, SLAP_OC_OPERATIONAL,
-		offsetof(struct slap_internal_schema, si_oc_monitor) },
-	{ "collectiveAttributeSubentry", "( 2.5.20.2 "
+#ifdef LDAP_DEVEL
+	{ "collectiveAttributeSubentry", "( 2.5.17.2 "
 			"NAME 'collectiveAttributeSubentry' "
 			"AUXILIARY )",
 		subentryObjectClass,
@@ -332,6 +331,31 @@ static struct slap_schema_oc_map {
 			"SUP top AUXILIARY )",
 		dynamicObjectClass, SLAP_OC_DYNAMICOBJECT,
 		offsetof(struct slap_internal_schema, si_oc_dynamicObject) },
+#endif
+#ifdef LDAP_SYNCREPL
+		{ "glue", "( 1.3.6.1.4.1.4203.666.3.4 "
+				"NAME 'glue' "
+				"DESC 'Glue Entry' "
+				"SUP top STRUCTURAL )",
+			0, SLAP_OC_OPERATIONAL,
+			offsetof(struct slap_internal_schema, si_oc_glue) },
+
+		{ "syncConsumerSubentry", "( 1.3.6.1.4.1.4203.666.3.5 "
+				"NAME 'syncConsumerSubentry' "
+				"DESC 'Persistent Info for SyncRepl Consumer' "
+				"AUXILIARY "
+				"MAY syncreplCookie )",
+			0, SLAP_OC_OPERATIONAL,
+			offsetof(struct slap_internal_schema, si_oc_syncConsumerSubentry) },
+		{ "syncProviderSubentry", "( 1.3.6.1.4.1.4203.666.3.6 "
+				"NAME 'syncProviderSubentry' "
+				"DESC 'Persistent Info for SyncRepl Producer' "
+				"AUXILIARY "
+				"MAY syncreplCookie )",
+			0, SLAP_OC_OPERATIONAL,
+			offsetof(struct slap_internal_schema, si_oc_syncProviderSubentry) },
+#endif
+
 	{ NULL, NULL, NULL, 0, 0 }
 };
 
@@ -423,6 +447,7 @@ static struct slap_schema_ad_map {
 		NULL, 0,
 		NULL, NULL, NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_subschemaSubentry) },
+#ifdef LDAP_DEVEL
 	{ "collectiveAttributeSubentries", "( 2.5.18.12 "
 			"NAME 'collectiveAttributeSubentries' "
 			"EQUALITY distinguishedNameMatch "
@@ -438,9 +463,10 @@ static struct slap_schema_ad_map {
 		NULL, SLAP_AT_HIDE,
 		NULL, NULL, NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_collectiveExclusions) },
+#endif
 
 	{ "entryUUID", "( 1.3.6.1.4.1.4203.666.1.6 NAME 'entryUUID' "   
-			"DESC 'LCUP/LDUP: universally unique identifier' "
+			"DESC 'LCUP/LDUP: UUID of the entry' "
 			"EQUALITY octetStringMatch "
 			"SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{64} "
 			"SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )",
@@ -448,16 +474,57 @@ static struct slap_schema_ad_map {
 		NULL, NULL, NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_entryUUID) },
 	{ "entryCSN", "( 1.3.6.1.4.1.4203.666.1.7 NAME 'entryCSN' "
-			"DESC 'LCUP/LDUP: change sequence number' "
+			"DESC 'LCUP/LDUP: change sequence number of the entry content' "
 			"EQUALITY octetStringMatch "
-#ifdef LDAP_CLIENT_UPDATE
 			"ORDERING octetStringOrderingMatch "
-#endif /* LDAP_CLIENT_UPDATE */
 			"SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{64} "
 			"SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )",
 		NULL, SLAP_AT_HIDE,
 		NULL, NULL, NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_entryCSN) },
+	{ "namingCSN", "( 1.3.6.1.4.1.4203.666.1.13 NAME 'namingCSN' "
+			"DESC 'LCUP/LDUP: change sequence number of the entry naming (RDN)' "
+			"EQUALITY octetStringMatch "
+			"ORDERING octetStringOrderingMatch "
+			"SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{64} "
+			"SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )",
+		NULL, SLAP_AT_HIDE,
+		NULL, NULL, NULL, NULL, NULL,
+		offsetof(struct slap_internal_schema, si_ad_namingCSN) },
+
+	{ "superiorUUID", "( 1.3.6.1.4.1.4203.666.1.11 NAME 'superiorUUID' "   
+			"DESC 'LCUP/LDUP: UUID of the superior entry' "
+			"EQUALITY octetStringMatch "
+			"SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{64} "
+			"SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )",
+		NULL, SLAP_AT_HIDE,
+		NULL, NULL, NULL, NULL, NULL,
+		offsetof(struct slap_internal_schema, si_ad_superiorUUID) },
+
+#ifdef LDAP_CACHING 
+	/* LDAP cache specific operational attribute */
+	{ "queryid", "( 1.3.6.1.4.1.4203.666.1.12 NAME 'queryid' "
+			"DESC 'list of queries the entry belongs to' "
+			"EQUALITY octetStringMatch "
+			"SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{64} "
+			"NO-USER-MODIFICATION USAGE directoryOperation )",
+		NULL, 0, /* SLAP_AT_HIDE or SLAP_AT_NONE ? */
+		NULL, NULL, NULL, NULL, NULL, 
+		offsetof(struct slap_internal_schema, si_ad_queryid) },
+#endif /* LDAP_CACHING */
+
+#ifdef LDAP_SYNCREPL
+	{ "syncreplCookie", "( 1.3.6.1.4.1.4203.666.1.23 "
+			"NAME 'syncreplCookie' "
+			"DESC 'syncrepl Cookie for shadow copy' "
+			"EQUALITY octetStringMatch "
+			"ORDERING octetStringOrderingMatch "
+			"SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{64} "
+			"SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )",
+		NULL, SLAP_AT_HIDE,
+		NULL, NULL, NULL, NULL, NULL,
+		offsetof(struct slap_internal_schema, si_ad_syncreplCookie) },
+#endif
 
 	/* root DSE attributes */
 	{ "altServer", "( 1.3.6.1.4.1.1466.101.120.6 NAME 'altServer' "
@@ -513,8 +580,7 @@ static struct slap_schema_ad_map {
 	{ "monitorContext", "( 1.3.6.1.4.1.4203.666.1.10 "
 			"NAME 'monitorContext' "
 			"DESC 'monitor context' "
-			"EQUALITY objectIdentifierMatch "
-			"SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 "
+			"SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 "
 			"SINGLE-VALUE NO-USER-MODIFICATION "
 			"USAGE dSAOperation )",
 		rootDseAttribute, SLAP_AT_HIDE,
@@ -680,6 +746,7 @@ static struct slap_schema_ad_map {
 		offsetof(struct slap_internal_schema, si_ad_aci) },
 #endif
 
+#ifdef LDAP_DEVEL
 	{ "entryTtl", "( 1.3.6.1.4.1.1466.101.119.3 NAME 'entryTtl' "
 			"DESC 'RFC2589: entry time-to-live' "
 			"SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE "
@@ -695,6 +762,7 @@ static struct slap_schema_ad_map {
 		rootDseAttribute, 0,
 		NULL, NULL, NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_dynamicSubtrees) },
+#endif
 
 	/* userApplication attributes (which system schema depends upon) */
 	{ "distinguishedName", "( 2.5.4.49 NAME 'distinguishedName' "
@@ -756,14 +824,13 @@ static struct slap_schema_ad_map {
 		NULL, NULL, NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_krbName) },
 #endif
-
-	{ NULL, NULL, NULL, 0, NULL, NULL, NULL, 0 }
+	{ NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0 }
 };
 
 static AttributeType slap_at_undefined = {
 	{ "1.1.1", NULL, NULL, 1, NULL,
 		NULL, NULL, NULL, NULL,
-		0, 0, 0, 1, 3 }, /* LDAPAttributeType */
+		0, 0, 0, 1, 3, NULL }, /* LDAPAttributeType */
 	{ sizeof("UNDEFINED")-1, "UNDEFINED" }, /* cname */
 	NULL, /* sup */
 	NULL, /* subtypes */
@@ -771,7 +838,7 @@ static AttributeType slap_at_undefined = {
 	NULL, /* syntax (this may need to be defined) */
 	(AttributeTypeSchemaCheckFN *) 0, /* schema check function */
 	SLAP_AT_ABSTRACT|SLAP_AT_FINAL,	/* mask */
-	NULL, /* next */
+	{ NULL }, /* next */
 	NULL /* attribute description */
 	/* mutex (don't know how to initialize it :) */
 };
@@ -780,10 +847,18 @@ static struct slap_schema_mr_map {
 	char *ssmm_name;
 	size_t ssmm_offset;
 } mr_map[] = {
+	{ "caseExactIA5Match",
+		offsetof(struct slap_internal_schema, si_mr_caseExactIA5Match) },
+	{ "caseExactMatch",
+		offsetof(struct slap_internal_schema, si_mr_caseExactMatch) },
+	{ "caseExactSubstringsMatch",
+		offsetof(struct slap_internal_schema, si_mr_caseExactSubstringsMatch) },
 	{ "distinguishedNameMatch",
 		offsetof(struct slap_internal_schema, si_mr_distinguishedNameMatch) },
 	{ "integerMatch",
 		offsetof(struct slap_internal_schema, si_mr_integerMatch) },
+	{ "integerFirstComponentMatch", offsetof(struct slap_internal_schema,
+		si_mr_integerFirstComponentMatch) },
 	{ NULL, 0 }
 };
 
@@ -791,12 +866,14 @@ static struct slap_schema_syn_map {
 	char *sssm_name;
 	size_t sssm_offset;
 } syn_map[] = {
-	{ "1.3.6.1.4.1.1466.115.121.1.40",
-		offsetof(struct slap_internal_schema, si_syn_octetString) },
+	{ "1.3.6.1.4.1.1466.115.121.1.15",
+		offsetof(struct slap_internal_schema, si_syn_directoryString) },
 	{ "1.3.6.1.4.1.1466.115.121.1.12",
 		offsetof(struct slap_internal_schema, si_syn_distinguishedName) },
 	{ "1.3.6.1.4.1.1466.115.121.1.27",
 		offsetof(struct slap_internal_schema, si_syn_integer) },
+	{ "1.3.6.1.4.1.1466.115.121.1.40",
+		offsetof(struct slap_internal_schema, si_syn_octetString) },
 	{ NULL, 0 }
 };