X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fschema.c;h=f99fb5d37dfd62624de89eaeaa1cb9b0da8453dd;hb=12d5c6bba210de4a03363567be1c19a37f8e806b;hp=c9d4436e8bc12f7da86f7cb4b8b8801cc9d2523e;hpb=acc32b9d9e731cf51d5f84ef392e9aa0c17e89de;p=openldap

diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index c9d4436e8b..f99fb5d37d 100644
--- a/servers/slapd/schema.c
+++ b/servers/slapd/schema.c
@@ -1,8 +1,17 @@
 /* schema.c - routines to manage schema definitions */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -32,8 +41,21 @@ schema_info( Entry **entry, const char **text )
 
 	Entry		*e;
 	struct berval	vals[5];
+	struct berval	nvals[5];
 
-	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
@@ -45,7 +67,13 @@ 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 );
+	if( attr_merge_one( e, ad_structuralObjectClass, vals, vals ) )
+	{
+		/* 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;
@@ -56,7 +84,13 @@ 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 );
+	if( attr_merge( e, ad_objectClass, vals, vals ) )
+	{
+		/* Out of memory, do something about it */
+		entry_free( e );
+		*text = "out of memory";
+		return LDAP_OTHER;
+	}
 
 	{
 		int rc;
@@ -81,7 +115,19 @@ schema_info( Entry **entry, const char **text )
 			return LDAP_OTHER;
 		}
 
-		attr_merge_one( e, desc, vals );
+		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 ) )
+		{
+			/* Out of memory, do something about it */
+			entry_free( e );
+			*text = "out of memory";
+			return LDAP_OTHER;
+		}
 	}
 
 	{
@@ -107,8 +153,20 @@ 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 );
+		if( attr_merge_one( e, ad_createTimestamp, vals, vals ) )
+		{
+			/* Out of memory, do something about it */
+			entry_free( e );
+			*text = "out of memory";
+			return LDAP_OTHER;
+		}
+		if( attr_merge_one( e, ad_modifyTimestamp, vals, vals ) )
+		{
+			/* Out of memory, do something about it */
+			entry_free( e );
+			*text = "out of memory";
+			return LDAP_OTHER;
+		}
 	}
 
 	if ( syn_schema_info( e )