X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fschema.c;h=725995150fe03669113f729be32e78165ce83579;hb=9fc4a749dcecda7176cea4859fa8f51bbc91feff;hp=5925b14e8e8f70d390b32948e4d66c09c0cb1f16;hpb=975a5e9a24e971197baa9ea2d4479100977c9060;p=openldap

diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index 5925b14e8e..725995150f 100644
--- a/servers/slapd/schema.c
+++ b/servers/slapd/schema.c
@@ -1,7 +1,7 @@
 /* schema.c - routines to manage schema definitions */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -28,54 +28,54 @@ schema_info( Entry **entry, const char **text )
 		= slap_schema.si_ad_objectClass;
 
 	Entry		*e;
-	struct berval	val;
-	struct berval	*vals[2];
+	struct berval	vals[2];
 
-	vals[0] = &val;
-	vals[1] = NULL;
+	vals[1].bv_val = NULL;
 
 	e = (Entry *) ch_calloc( 1, sizeof(Entry) );
 
 	e->e_attrs = NULL;
-	ber_str2bv( SLAPD_SCHEMA_DN, sizeof(SLAPD_SCHEMA_DN)-1, 1, &e->e_name);
-	(void) dnNormalize2( NULL, &e->e_name, &e->e_nname );
+	/* backend-specific schema info should be created by the
+	 * backend itself
+	 */
+	ber_dupbv( &e->e_name, &global_schemadn );
+	ber_dupbv( &e->e_nname, &global_schemandn );
 	e->e_private = NULL;
 
-	val.bv_val = "LDAPsubentry";
-	val.bv_len = sizeof("LDAPsubentry")-1;
+	vals[0].bv_val = "subentry";
+	vals[0].bv_len = sizeof("subentry")-1;
 	attr_merge( e, ad_structuralObjectClass, vals );
 
-	val.bv_val = "top";
-	val.bv_len = sizeof("top")-1;
+	vals[0].bv_val = "top";
+	vals[0].bv_len = sizeof("top")-1;
 	attr_merge( e, ad_objectClass, vals );
 
-	val.bv_val = "LDAPsubentry";
-	val.bv_len = sizeof("LDAPsubentry")-1;
+	vals[0].bv_val = "subentry";
+	vals[0].bv_len = sizeof("subentry")-1;
 	attr_merge( e, ad_objectClass, vals );
 
-	val.bv_val = "subschema";
-	val.bv_len = sizeof("subschema")-1;
+	vals[0].bv_val = "subschema";
+	vals[0].bv_len = sizeof("subschema")-1;
 	attr_merge( e, ad_objectClass, vals );
 
-	val.bv_val = "extensibleObject";
-	val.bv_len = sizeof("extensibleObject")-1;
+	vals[0].bv_val = "extensibleObject";
+	vals[0].bv_len = sizeof("extensibleObject")-1;
 	attr_merge( e, ad_objectClass, vals );
 
 	{
 		int rc;
 		AttributeDescription *desc = NULL;
-		struct berval rdn = { sizeof(SLAPD_SCHEMA_DN)-1,
-			SLAPD_SCHEMA_DN };
-		val.bv_val = strchr( rdn.bv_val, '=' );
+		struct berval rdn = global_schemadn;
+		vals[0].bv_val = strchr( rdn.bv_val, '=' );
 
-		if( val.bv_val == NULL ) {
+		if( vals[0].bv_val == NULL ) {
 			*text = "improperly configured subschema subentry";
 			return LDAP_OTHER;
 		}
 
-		val.bv_val++;
-		val.bv_len = rdn.bv_len - (val.bv_val - rdn.bv_val);
-		rdn.bv_len -= val.bv_len + 1;
+		vals[0].bv_val++;
+		vals[0].bv_len = rdn.bv_len - (vals[0].bv_val - rdn.bv_val);
+		rdn.bv_len -= vals[0].bv_len + 1;
 
 		rc = slap_bv2ad( &rdn, &desc, text );
 
@@ -90,6 +90,7 @@ schema_info( Entry **entry, const char **text )
 
 	if ( syn_schema_info( e ) 
 		|| mr_schema_info( e )
+		|| mru_schema_info( e )
 		|| at_schema_info( e )
 		|| oc_schema_info( e ) )
 	{
@@ -103,4 +104,3 @@ schema_info( Entry **entry, const char **text )
 	return LDAP_SUCCESS;
 }
 #endif
-