--- servers/slapd/root_dse.c	2002/01/02 10:00:37	1.52
+++ servers/slapd/root_dse.c	2002/04/08 16:37:38	1.62
@@ -1,7 +1,7 @@
-/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.51 2001/12/26 15:42:35 kurt Exp $ */
+/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.61 2002/02/15 15:33:44 hyc Exp $ */
 /* root_dse.c - Provides the ROOT DSA-Specific Entry
  *
- * Copyright 1999-2000 The OpenLDAP Foundation.
+ * Copyright 1999-2002 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted only
@@ -17,11 +17,15 @@
 
 #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 */
-	NULL
+static struct berval supportedFeatures[] = {
+	BER_BVC("1.3.6.1.4.1.4203.1.5.1"), /* all Operational Attributes ("+") */
+	BER_BVC("1.3.6.1.4.1.4203.1.5.2"), /* OCs in Attributes List */
+	BER_BVC("1.3.6.1.4.1.4203.1.5.3"), /* (&) and (|) search filters */
+	BER_BVC("1.3.6.1.4.1.4203.1.5.4"), /* Language Tag Options */
+	BER_BVC("1.3.6.1.4.1.4203.1.5.5"), /* Language Range Options */
+	{0,NULL}
 };
 
 static Entry	*usr_attr = NULL;
@@ -34,7 +38,7 @@ root_dse_info(
 {
 	char buf[BUFSIZ];
 	Entry		*e;
-	struct berval	vals[2];
+	struct berval	vals[2], *bv;
 	int		i, j;
 	char ** supportedSASLMechanisms;
 
@@ -57,8 +61,6 @@ root_dse_info(
 	AttributeDescription *ad_ref
 		= slap_schema.si_ad_ref;
 
-	Attribute *a;
-
 	vals[1].bv_val = NULL;
 
 	e = (Entry *) ch_calloc( 1, sizeof(Entry) );
@@ -72,7 +74,6 @@ root_dse_info(
 	/* the DN is an empty string so no pretty/normalization is needed */
 	assert( !e->e_name.bv_len );
 	assert( !e->e_nname.bv_len );
-	
 
 	e->e_private = NULL;
 
@@ -89,8 +90,9 @@ root_dse_info(
 	attr_merge( e, ad_objectClass, vals );
 
 	for ( i = 0; i < nbackends; i++ ) {
-		if ( backends[i].be_glueflags & SLAP_GLUE_SUBORDINATE )
+		if ( backends[i].be_flags & SLAP_BFLAG_GLUE_SUBORDINATE ) {
 			continue;
+		}
 		for ( j = 0; backends[i].be_suffix[j] != NULL; j++ ) {
 			vals[0] = *backends[i].be_suffix[j];
 			attr_merge( e, ad_namingContexts, vals );
@@ -100,24 +102,19 @@ root_dse_info(
 	/* altServer unsupported */
 
 	/* supportedControl */
-	for ( i=0; supportedControls[i] != NULL; i++ ) {
-		vals[0].bv_val = supportedControls[i];
+	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 );
 	}
 
 	/* supportedExtension */
-	for ( i=0; (vals[0].bv_val = get_supported_extop(i)) != NULL; i++ ) {
-		vals[0].bv_len = strlen( vals[0].bv_val );
+	for ( i=0; (bv = get_supported_extop(i)) != NULL; i++ ) {
+		vals[0] = *bv;
 		attr_merge( e, ad_supportedExtension, vals );
 	}
 
 	/* 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 );
-	}
+	attr_merge( e, ad_supportedFeatures, supportedFeatures );
 
 	/* supportedLDAPVersion */
 	for ( i=LDAP_VERSION_MIN; i<=LDAP_VERSION_MAX; i++ ) {
@@ -150,7 +147,8 @@ root_dse_info(
 	}
 
 	if( usr_attr != NULL) {
-		for(a = usr_attr->e_attrs; a != NULL; a = a->a_next) {
+		Attribute *a;
+		for( a = usr_attr->e_attrs; a != NULL; a = a->a_next ) {
 			attr_merge( e, a->a_desc, a->a_vals );
 		}
 	}
@@ -171,8 +169,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",
@@ -186,6 +182,7 @@ int read_root_dse_file( const char *fnam
 
 	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",
@@ -222,6 +219,6 @@ int read_root_dse_file( const char *fnam
 
 	ch_free( buf );
 
-	Debug(LDAP_DEBUG_CONFIG,"rootDSE file %s read.\n", fname, 0, 0);
+	Debug(LDAP_DEBUG_CONFIG, "rootDSE file %s read.\n", fname, 0, 0);
 	return rc;
 }