X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fschema.c;h=c5cb507770e5c2f3ca32d40892b62babd255ccae;hb=2d68ec09f2692fa4832e274fb026641be1ea3bc7;hp=452a679ff26f85f8abb2a7f25363720898470ab4;hpb=804a111fbd4f1e348009b115cb601dcfe2ba7ede;p=openldap

diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index 452a679ff2..c5cb507770 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-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -18,8 +18,6 @@
 #include "lutil.h"
 
 
-#if defined( SLAPD_SCHEMA_DN )
-
 int
 schema_info( Entry **entry, const char **text )
 {
@@ -34,8 +32,23 @@ schema_info( Entry **entry, const char **text )
 
 	Entry		*e;
 	struct berval	vals[5];
+#ifdef SLAP_NVALUES
+	struct berval	nvals[5];
+#endif
 
-	e = (Entry *) ch_calloc( 1, sizeof(Entry) );
+	e = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );
+	if( e == NULL ) {
+		/* Out of memory, do something about it */
+#ifdef NEW_LOGGING
+		LDAP_LOG( OPERATION, ERR, 
+			"schema_info: SLAP_CALLOC failed - out of memory.\n", 0, 0,0 );
+#else
+		Debug( LDAP_DEBUG_ANY, 
+			"schema_info: SLAP_CALLOC failed - out of memory.\n", 0, 0, 0 );
+#endif
+		*text = "out of memory";
+		return LDAP_OTHER;
+	}
 
 	e->e_attrs = NULL;
 	/* backend-specific schema info should be created by the
@@ -47,7 +60,17 @@ schema_info( Entry **entry, const char **text )
 
 	vals[0].bv_val = "subentry";
 	vals[0].bv_len = sizeof("subentry")-1;
-	attr_merge_one( e, ad_structuralObjectClass, vals );
+#ifdef SLAP_NVALUES
+	if( attr_merge_one( e, ad_structuralObjectClass, vals, vals ) )
+#else
+	if( attr_merge_one( e, ad_structuralObjectClass, vals ) )
+#endif
+	{
+		/* Out of memory, do something about it */
+		entry_free( e );
+		*text = "out of memory";
+		return LDAP_OTHER;
+	}
 
 	vals[0].bv_val = "top";
 	vals[0].bv_len = sizeof("top")-1;
@@ -58,7 +81,17 @@ schema_info( Entry **entry, const char **text )
 	vals[3].bv_val = "extensibleObject";
 	vals[3].bv_len = sizeof("extensibleObject")-1;
 	vals[4].bv_val = NULL;
-	attr_merge( e, ad_objectClass, vals );
+#ifdef SLAP_NVALUES
+	if( attr_merge( e, ad_objectClass, vals, vals ) )
+#else
+	if( attr_merge( e, ad_objectClass, vals ) )
+#endif
+	{
+		/* Out of memory, do something about it */
+		entry_free( e );
+		*text = "out of memory";
+		return LDAP_OTHER;
+	}
 
 	{
 		int rc;
@@ -83,7 +116,23 @@ schema_info( Entry **entry, const char **text )
 			return LDAP_OTHER;
 		}
 
-		attr_merge_one( e, desc, vals );
+#ifdef SLAP_NVALUES
+		nvals[0].bv_val = strchr( global_schemandn.bv_val, '=' );
+		assert( nvals[0].bv_val );
+		nvals[0].bv_val++;
+		nvals[0].bv_len = global_schemandn.bv_len -
+			(nvals[0].bv_val - global_schemandn.bv_val);
+
+		if( attr_merge_one( e, desc, vals, nvals ) )
+#else
+		if( attr_merge_one( e, desc, vals ) )
+#endif
+		{
+			/* Out of memory, do something about it */
+			entry_free( e );
+			*text = "out of memory";
+			return LDAP_OTHER;
+		}
 	}
 
 	{
@@ -109,15 +158,36 @@ schema_info( Entry **entry, const char **text )
 		vals[0].bv_val = timebuf;
 		vals[0].bv_len = strlen( timebuf );
 
-		attr_merge_one( e, ad_createTimestamp, vals );
-		attr_merge_one( e, ad_modifyTimestamp, vals );
+#ifdef SLAP_NVALUES
+		if( attr_merge_one( e, ad_createTimestamp, vals, vals ) )
+#else
+		if( attr_merge_one( e, ad_createTimestamp, vals ) )
+#endif
+		{
+			/* Out of memory, do something about it */
+			entry_free( e );
+			*text = "out of memory";
+			return LDAP_OTHER;
+		}
+#ifdef SLAP_NVALUES
+		if( attr_merge_one( e, ad_modifyTimestamp, vals, vals ) )
+#else
+		if( attr_merge_one( e, ad_modifyTimestamp, vals ) )
+#endif
+		{
+			/* Out of memory, do something about it */
+			entry_free( e );
+			*text = "out of memory";
+			return LDAP_OTHER;
+		}
 	}
 
 	if ( syn_schema_info( e ) 
 		|| mr_schema_info( e )
 		|| mru_schema_info( e )
 		|| at_schema_info( e )
-		|| oc_schema_info( e ) )
+		|| oc_schema_info( e )
+		|| cr_schema_info( e ) )
 	{
 		/* Out of memory, do something about it */
 		entry_free( e );
@@ -128,4 +198,3 @@ schema_info( Entry **entry, const char **text )
 	*entry = e;
 	return LDAP_SUCCESS;
 }
-#endif