--- servers/slapd/root_dse.c	2002/01/04 20:17:47	1.55
+++ servers/slapd/root_dse.c	2003/03/03 21:25:28	1.78
@@ -1,7 +1,7 @@
-/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.54 2002/01/03 07:02:17 kurt Exp $ */
+/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.77 2003/02/28 11:34:35 lukeh Exp $ */
 /* root_dse.c - Provides the ROOT DSA-Specific Entry
  *
- * Copyright 1999-2002 The OpenLDAP Foundation.
+ * Copyright 1999-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted only
@@ -13,16 +13,24 @@
 #include "portable.h"
 
 #include <stdio.h>
+
 #include <ac/string.h>
 
 #include "slap.h"
 #include <ldif.h>
+#include "lber_pvt.h"
 
-static char *supportedFeatures[] = {
-	"1.3.6.1.4.1.4203.1.5.1", /* all Operational Attributes ("+") */
-	"1.3.6.1.4.1.4203.1.5.2", /* OCs in Attributes List */
-	"1.3.6.1.4.1.4203.1.5.3", /* (&) and (|) search filters */
-	NULL
+#ifdef LDAP_SLAPI
+#include "slapi.h"
+#endif
+
+static struct berval supportedFeatures[] = {
+	BER_BVC(LDAP_FEATURE_ALL_OPERATIONAL_ATTRS), /* all Operational Attributes ("+") */
+	BER_BVC(LDAP_FEATURE_OBJECTCLASS_ATTRS), /* OCs in Attributes List */
+	BER_BVC(LDAP_FEATURE_ABSOLUTE_FILTERS), /* (&) and (|) search filters */
+	BER_BVC(LDAP_FEATURE_LANGUAGE_TAG_OPTIONS), /* Language Tag Options */
+	BER_BVC(LDAP_FEATURE_LANGUAGE_RANGE_OPTIONS), /* Language Range Options */
+	{0,NULL}
 };
 
 static Entry	*usr_attr = NULL;
@@ -33,9 +41,11 @@ root_dse_info(
 	Entry **entry,
 	const char **text )
 {
-	char buf[BUFSIZ];
 	Entry		*e;
-	struct berval	vals[2];
+	struct berval vals[2], *bv;
+#ifdef SLAP_NVALUES
+	struct berval nvals[2];
+#endif
 	int		i, j;
 	char ** supportedSASLMechanisms;
 
@@ -45,8 +55,6 @@ root_dse_info(
 		= slap_schema.si_ad_objectClass;
 	AttributeDescription *ad_namingContexts
 		= slap_schema.si_ad_namingContexts;
-	AttributeDescription *ad_supportedControl
-		= slap_schema.si_ad_supportedControl;
 	AttributeDescription *ad_supportedExtension
 		= slap_schema.si_ad_supportedExtension;
 	AttributeDescription *ad_supportedLDAPVersion
@@ -55,14 +63,28 @@ root_dse_info(
 		= slap_schema.si_ad_supportedSASLMechanisms;
 	AttributeDescription *ad_supportedFeatures
 		= slap_schema.si_ad_supportedFeatures;
+	AttributeDescription *ad_monitorContext
+		= slap_schema.si_ad_monitorContext;
 	AttributeDescription *ad_ref
 		= slap_schema.si_ad_ref;
 
-	Attribute *a;
-
 	vals[1].bv_val = NULL;
-
-	e = (Entry *) ch_calloc( 1, sizeof(Entry) );
+#ifdef SLAP_NVALUES
+	nvals[1].bv_val = NULL;
+#endif
+
+	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 );
@@ -76,61 +98,127 @@ root_dse_info(
 
 	e->e_private = NULL;
 
-	vals[0].bv_val = "OpenLDAProotDSE";
-	vals[0].bv_len = sizeof("OpenLDAProotDSE")-1;
-	attr_merge( e, ad_structuralObjectClass, vals );
-
 	vals[0].bv_val = "top";
 	vals[0].bv_len = sizeof("top")-1;
-	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
+	{
+		return LDAP_OTHER;
+	}
 
 	vals[0].bv_val = "OpenLDAProotDSE";
 	vals[0].bv_len = sizeof("OpenLDAProotDSE")-1;
-	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
+		return LDAP_OTHER;
+#ifdef SLAP_NVALUES
+	if( attr_merge( e, ad_structuralObjectClass, vals, vals ) )
+#else
+	if( attr_merge( e, ad_structuralObjectClass, vals ) )
+#endif
+		return LDAP_OTHER;
 
 	for ( i = 0; i < nbackends; i++ ) {
-		if ( backends[i].be_glueflags & SLAP_GLUE_SUBORDINATE )
+		if ( backends[i].be_flags & SLAP_BFLAG_MONITOR ) {
+			vals[0] = backends[i].be_suffix[0];
+#ifdef SLAP_NVALUES
+			if( attr_merge( e, ad_monitorContext, vals, nvals ) )
+#else
+			if( attr_merge( e, ad_monitorContext, vals ) )
+#endif
+			{
+				return LDAP_OTHER;
+			}
+			continue;
+		}
+		if ( SLAP_GLUE_SUBORDINATE( &backends[i] ) ) {
 			continue;
-		for ( j = 0; backends[i].be_suffix[j] != NULL; j++ ) {
-			vals[0] = *backends[i].be_suffix[j];
-			attr_merge( e, ad_namingContexts, vals );
+		}
+		for ( j = 0; backends[i].be_suffix[j].bv_val != NULL; j++ ) {
+			vals[0] = backends[i].be_suffix[j];
+#ifdef SLAP_NVALUES
+			if( attr_merge( e, ad_namingContexts, vals, NULL ) )
+#else
+			if( attr_merge( e, ad_namingContexts, vals ) )
+#endif
+			{
+				return LDAP_OTHER;
+			}
 		}
 	}
 
 	/* altServer unsupported */
 
 	/* supportedControl */
-	for ( i=0; supportedControls[i] != NULL; i++ ) {
-		vals[0].bv_val = supportedControls[i];
-		vals[0].bv_len = strlen( vals[0].bv_val );
-		attr_merge( e, ad_supportedControl, vals );
+	if ( controls_root_dse_info( e ) != 0 ) {
+		return LDAP_OTHER;
 	}
 
 	/* supportedExtension */
-	for ( i=0; (vals[0].bv_val = get_supported_extop(i)) != NULL; i++ ) {
-		vals[0].bv_len = strlen( vals[0].bv_val );
-		attr_merge( e, ad_supportedExtension, vals );
+	for ( i=0; (bv = get_supported_extop(i)) != NULL; i++ ) {
+		vals[0] = *bv;
+#ifdef SLAP_NVALUES
+		if( attr_merge( e, ad_supportedExtension, vals, NULL ) )
+#else
+		if( attr_merge( e, ad_supportedExtension, vals ) )
+#endif
+		{
+			return LDAP_OTHER;
+		}
 	}
 
+#ifdef LDAP_SLAPI
+	/* netscape supportedExtension */
+	for ( i = 0; (bv = ns_get_supported_extop(i)) != NULL; i++ ) {
+		vals[0] = *bv;
+#ifdef SLAP_NVALUES
+		if( attr_merge( e, ad_supportedExtension, vals, NULL ))
+#else
+		if( attr_merge( e, ad_supportedExtension, vals ))
+#endif
+		{
+			return LDAP_OTHER;
+		}
+	}
+#endif /* LDAP_SLAPI */
+
 	/* supportedFeatures */
-	for ( i=0; supportedFeatures[i] != NULL; i++ ) {
-		vals[0].bv_val = supportedFeatures[i];
-		vals[0].bv_len = strlen( vals[0].bv_val );
-		attr_merge( e, ad_supportedFeatures, vals );
+#ifdef SLAP_NVALUES
+	if( attr_merge( e, ad_supportedFeatures,
+		supportedFeatures, supportedFeatures ) )
+#else
+	if( attr_merge( e, ad_supportedFeatures, supportedFeatures ) )
+#endif
+	{
+		return LDAP_OTHER;
 	}
 
 	/* supportedLDAPVersion */
 	for ( i=LDAP_VERSION_MIN; i<=LDAP_VERSION_MAX; i++ ) {
+		char buf[BUFSIZ];
 		if (!( global_allows & SLAP_ALLOW_BIND_V2 ) &&
 			( i < LDAP_VERSION3 ) )
 		{
 			/* version 2 and lower are disallowed */
 			continue;
 		}
-		sprintf(buf,"%d",i);
+		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 );
+#ifdef SLAP_NVALUES
+		if( attr_merge( e, ad_supportedLDAPVersion, vals, NULL ) )
+#else
+		if( attr_merge( e, ad_supportedLDAPVersion, vals ) )
+#endif
+		{
+			return LDAP_OTHER;
+		}
 	}
 
 	/* supportedSASLMechanism */
@@ -140,18 +228,40 @@ 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 );
+#ifdef SLAP_NVALUES
+			if( attr_merge( e, ad_supportedSASLMechanisms, vals, NULL ) )
+#else
+			if( attr_merge( e, ad_supportedSASLMechanisms, vals ) )
+#endif
+			{
+				return LDAP_OTHER;
+			}
 		}
-		charray_free( supportedSASLMechanisms );
+		ldap_charray_free( supportedSASLMechanisms );
 	}
 
 	if ( default_referral != NULL ) {
-		attr_merge( e, ad_ref, default_referral );
+#ifdef SLAP_NVALUES
+		if( attr_merge( e, ad_ref, default_referral, NULL /* FIXME */ ) )
+#else
+		if( attr_merge( e, ad_ref, default_referral ) )
+#endif
+		{
+			return LDAP_OTHER;
+		}
 	}
 
 	if( usr_attr != NULL) {
-		for(a = usr_attr->e_attrs; a != NULL; a = a->a_next) {
-			attr_merge( e, a->a_desc, a->a_vals );
+		Attribute *a;
+		for( a = usr_attr->e_attrs; a != NULL; a = a->a_next ) {
+#ifdef SLAP_NVALUES
+			if( attr_merge( e, a->a_desc, a->a_vals, a->a_nvals ) )
+#else
+			if( attr_merge( e, a->a_desc, a->a_vals ) )
+#endif
+			{
+				return LDAP_OTHER;
+			}
 		}
 	}
 
@@ -171,8 +281,6 @@ int read_root_dse_file( const char *fnam
 	int rc = 0, lineno = 0, lmax = 0;
 	char	*buf = NULL;
 
-	Attribute *a;
-
 	if ( (fp = fopen( fname, "r" )) == NULL ) {
 		Debug( LDAP_DEBUG_ANY,
 			"could not open rootdse attr file \"%s\" - absolute path?\n",
@@ -181,16 +289,26 @@ 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 ) ) {
 		Entry *e = str2entry( buf );
+		Attribute *a;
 
 		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;
@@ -214,7 +332,14 @@ 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 );
+#ifdef SLAP_NVALUES
+			if( attr_merge( usr_attr, a->a_desc, a->a_vals, a->a_nvals ) )
+#else
+			if( attr_merge( usr_attr, a->a_desc, a->a_vals ) )
+#endif
+			{
+				return LDAP_OTHER;
+			}
 		}
 
 		entry_free( e );