--- servers/slapd/root_dse.c	2002/08/29 02:10:44	1.61.2.5
+++ servers/slapd/root_dse.c	2002/11/11 02:42:37	1.61.2.6
@@ -1,4 +1,4 @@
-/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.61.2.4 2002/07/28 19:17:38 kurt Exp $ */
+/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.61.2.5 2002/08/29 02:10:44 kurt Exp $ */
 /* root_dse.c - Provides the ROOT DSA-Specific Entry
  *
  * Copyright 1999-2002 The OpenLDAP Foundation.
@@ -64,7 +64,18 @@ root_dse_info(
 
 	vals[1].bv_val = NULL;
 
-	e = (Entry *) ch_calloc( 1, sizeof(Entry) );
+	e = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );
+
+	if( e == NULL ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( OPERATION, ERR,
+			"root_dse_info: SLAP_CALLOC failed", 0, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_ANY,
+			"root_dse_info: SLAP_CALLOC failed", 0, 0, 0 );
+#endif
+		return LDAP_OTHER;
+	}
 
 	e->e_attrs = NULL;
 	e->e_name.bv_val = ch_strdup( LDAP_ROOT_DSE );
@@ -80,17 +91,21 @@ root_dse_info(
 
 	vals[0].bv_val = "top";
 	vals[0].bv_len = sizeof("top")-1;
-	attr_merge( e, ad_objectClass, vals );
+	if( attr_merge( e, ad_objectClass, vals ) )
+		return LDAP_OTHER;
 
 	vals[0].bv_val = "OpenLDAProotDSE";
 	vals[0].bv_len = sizeof("OpenLDAProotDSE")-1;
-	attr_merge( e, ad_objectClass, vals );
-	attr_merge( e, ad_structuralObjectClass, vals );
+	if( attr_merge( e, ad_objectClass, vals ) )
+		return LDAP_OTHER;
+	if( attr_merge( e, ad_structuralObjectClass, vals ) )
+		return LDAP_OTHER;
 
 	for ( i = 0; i < nbackends; i++ ) {
 		if ( backends[i].be_flags & SLAP_BFLAG_MONITOR ) {
 			vals[0] = backends[i].be_suffix[0];
-			attr_merge( e, ad_monitorContext, vals );
+			if( attr_merge( e, ad_monitorContext, vals ) )
+				return LDAP_OTHER;
 			continue;
 		}
 		if ( backends[i].be_flags & SLAP_BFLAG_GLUE_SUBORDINATE ) {
@@ -98,7 +113,8 @@ root_dse_info(
 		}
 		for ( j = 0; backends[i].be_suffix[j].bv_val != NULL; j++ ) {
 			vals[0] = backends[i].be_suffix[j];
-			attr_merge( e, ad_namingContexts, vals );
+			if( attr_merge( e, ad_namingContexts, vals ) )
+				return LDAP_OTHER;
 		}
 	}
 
@@ -107,17 +123,20 @@ root_dse_info(
 	/* supportedControl */
 	for ( i=0; (vals[0].bv_val = get_supported_ctrl(i)) != NULL; i++ ) {
 		vals[0].bv_len = strlen( vals[0].bv_val );
-		attr_merge( e, ad_supportedControl, vals );
+		if( attr_merge( e, ad_supportedControl, vals ) )
+			return LDAP_OTHER;
 	}
 
 	/* supportedExtension */
 	for ( i=0; (bv = get_supported_extop(i)) != NULL; i++ ) {
 		vals[0] = *bv;
-		attr_merge( e, ad_supportedExtension, vals );
+		if( attr_merge( e, ad_supportedExtension, vals ) )
+			return LDAP_OTHER;
 	}
 
 	/* supportedFeatures */
-	attr_merge( e, ad_supportedFeatures, supportedFeatures );
+	if( attr_merge( e, ad_supportedFeatures, supportedFeatures ) )
+		return LDAP_OTHER;
 
 	/* supportedLDAPVersion */
 	for ( i=LDAP_VERSION_MIN; i<=LDAP_VERSION_MAX; i++ ) {
@@ -131,7 +150,8 @@ root_dse_info(
 		snprintf(buf, sizeof buf, "%d", i);
 		vals[0].bv_val = buf;
 		vals[0].bv_len = strlen( vals[0].bv_val );
-		attr_merge( e, ad_supportedLDAPVersion, vals );
+		if( attr_merge( e, ad_supportedLDAPVersion, vals ) )
+			return LDAP_OTHER;
 	}
 
 	/* supportedSASLMechanism */
@@ -141,19 +161,22 @@ root_dse_info(
 		for ( i=0; supportedSASLMechanisms[i] != NULL; i++ ) {
 			vals[0].bv_val = supportedSASLMechanisms[i];
 			vals[0].bv_len = strlen( vals[0].bv_val );
-			attr_merge( e, ad_supportedSASLMechanisms, vals );
+			if( attr_merge( e, ad_supportedSASLMechanisms, vals ) )
+				return LDAP_OTHER;
 		}
 		ldap_charray_free( supportedSASLMechanisms );
 	}
 
 	if ( default_referral != NULL ) {
-		attr_merge( e, ad_ref, default_referral );
+		if( attr_merge( e, ad_ref, default_referral ) )
+			return LDAP_OTHER;
 	}
 
 	if( usr_attr != NULL) {
 		Attribute *a;
 		for( a = usr_attr->e_attrs; a != NULL; a = a->a_next ) {
-			attr_merge( e, a->a_desc, a->a_vals );
+			if( attr_merge( e, a->a_desc, a->a_vals ) )
+				return LDAP_OTHER;
 		}
 	}
 
@@ -181,7 +204,17 @@ int read_root_dse_file( const char *fnam
 		return EXIT_FAILURE;
 	}
 
-	usr_attr = (Entry *) ch_calloc( 1, sizeof(Entry) );
+	usr_attr = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );
+	if( usr_attr == NULL ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( OPERATION, ERR,
+			"read_root_dse_file: SLAP_CALLOC failed", 0, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_ANY,
+			"read_root_dse_file: SLAP_CALLOC failed", 0, 0, 0 );
+#endif
+		return LDAP_OTHER;
+	}
 	usr_attr->e_attrs = NULL;
 
 	while( ldif_read_record( fp, &lineno, &buf, &lmax ) ) {
@@ -191,7 +224,6 @@ int read_root_dse_file( const char *fnam
 		if( e == NULL ) {
 			fprintf( stderr, "root_dse: could not parse entry (line=%d)\n",
 				lineno );
-			entry_free( e );
 			entry_free( usr_attr );
 			usr_attr = NULL;
 			return EXIT_FAILURE;
@@ -215,7 +247,8 @@ int read_root_dse_file( const char *fnam
 		 */
 
 		for(a = e->e_attrs; a != NULL; a = a->a_next) {
-			attr_merge( usr_attr, a->a_desc, a->a_vals );
+			if( attr_merge( usr_attr, a->a_desc, a->a_vals ) )
+				return LDAP_OTHER;
 		}
 
 		entry_free( e );