--- servers/slapd/root_dse.c	1999/08/16 23:54:02	1.15
+++ servers/slapd/root_dse.c	2000/05/15 19:05:25	1.30
@@ -1,6 +1,7 @@
+/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.29 2000/05/15 14:33:07 kurt Exp $ */
 /* root_dse.c - Provides the ROOT DSA-Specific Entry
  *
- * Copyright 1999 The OpenLDAP Foundation.
+ * Copyright 1999-2000 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted only
@@ -12,8 +13,8 @@
 #include "portable.h"
 
 #include <stdio.h>
+#include <ac/string.h>
 
-#include "ldap_defaults.h"
 #include "slap.h"
 
 void
@@ -33,50 +34,30 @@ root_dse_info( Connection *conn, Operati
 	e->e_attrs = NULL;
 	e->e_dn = ch_strdup( LDAP_ROOT_DSE );
 	e->e_ndn = ch_strdup( LDAP_ROOT_DSE );
-	(void) dn_normalize_case( e->e_ndn );
+	(void) dn_normalize( e->e_ndn );
 	e->e_private = NULL;
 
 	for ( i = 0; i < nbackends; i++ ) {
 		for ( j = 0; backends[i].be_suffix[j] != NULL; j++ ) {
 			val.bv_val = backends[i].be_suffix[j];
 			val.bv_len = strlen( val.bv_val );
-			attr_merge( e, "namingContexts", vals );
+			attr_merge( e, slap_schema.si_ad_namingContexts, vals );
 		}
 	}
 
-#if defined( SLAPD_MONITOR_DN )
-	val.bv_val = SLAPD_MONITOR_DN;
-	val.bv_len = strlen( val.bv_val );
-	attr_merge( e, "namingContexts", vals );
-	/* subschemasubentry is added by send_search_entry() */
-#endif
-
-#if defined( SLAPD_CONFIG_DN )
-	val.bv_val = SLAPD_CONFIG_DN;
-	val.bv_len = strlen( val.bv_val );
-	attr_merge( e, "namingContexts", vals );
-#endif
-
-#if defined( SLAPD_SCHEMA_DN )
-	val.bv_val = SLAPD_SCHEMA_DN;
-	val.bv_len = strlen( val.bv_val );
-	attr_merge( e, "namingContexts", vals );
-#endif
-
 	/* altServer unsupported */
 
 	/* supportedControl */
 	for ( i=0; supportedControls[i] != NULL; i++ ) {
 		val.bv_val = supportedControls[i];
 		val.bv_len = strlen( val.bv_val );
-		attr_merge( e, "supportedControl", vals );
+		attr_merge( e, slap_schema.si_ad_supportedControl, vals );
 	}
 
 	/* supportedExtension */
-	for ( i=0; supportedExtensions[i] != NULL; i++ ) {
-		val.bv_val = supportedExtensions[i];
+	for ( i=0; (val.bv_val = get_supported_extop(i)) != NULL; i++ ) {
 		val.bv_len = strlen( val.bv_val );
-		attr_merge( e, "supportedExtension", vals );
+		attr_merge( e, slap_schema.si_ad_supportedExtension, vals );
 	}
 
 	/* supportedLDAPVersion */
@@ -84,7 +65,7 @@ root_dse_info( Connection *conn, Operati
 		sprintf(buf,"%d",i);
 		val.bv_val = buf;
 		val.bv_len = strlen( val.bv_val );
-		attr_merge( e, "supportedLDAPVersion", vals );
+		attr_merge( e, slap_schema.si_ad_supportedLDAPVersion, vals );
 	}
 
 	/* supportedSASLMechanism */
@@ -92,28 +73,33 @@ root_dse_info( Connection *conn, Operati
 		for ( i=0; supportedSASLMechanisms[i] != NULL; i++ ) {
 			val.bv_val = supportedSASLMechanisms[i];
 			val.bv_len = strlen( val.bv_val );
-			attr_merge( e, "supportedSASLMechanisms", vals );
+			attr_merge( e, slap_schema.si_ad_supportedSASLMechanisms, vals );
 		}
 	}
 
+#ifdef SLAPD_ACI_ENABLED
+	/* supportedACIMechanisms */
+	for ( i=0; (val.bv_val = get_supported_acimech(i)) != NULL; i++ ) {
+		val.bv_len = strlen( val.bv_val );
+		attr_merge( e, slap_schema.si_ad_supportedSASLMechanisms, vals );
+	}
+#endif
+
 	if ( default_referral != NULL ) {
-		attr_merge( e, "ref", default_referral );
+		attr_merge( e, slap_schema.si_ad_ref, default_referral );
 	}
 
 	val.bv_val = "top";
 	val.bv_len = sizeof("top")-1;
-	attr_merge( e, "objectClass", vals );
+	attr_merge( e, slap_schema.si_ad_objectClass, vals );
 
-	val.bv_val = "LDAPsubentry";
-	val.bv_len = sizeof("LDAPsubentry")-1;
-	attr_merge( e, "objectClass", vals );
-
-	val.bv_val = "extensibleObject";
-	val.bv_len = sizeof("extensibleObject")-1;
-	attr_merge( e, "objectClass", vals );
+	val.bv_val = "LDAProotDSE";
+	val.bv_len = sizeof("LDAProotDSE")-1;
+	attr_merge( e, slap_schema.si_ad_objectClass, vals );
 
 	send_search_entry( &backends[0], conn, op,
 		e, attrs, attrsonly, NULL );
+
 	send_search_result( conn, op, LDAP_SUCCESS,
 		NULL, NULL, NULL, NULL, 1 );