--- servers/slapd/root_dse.c	2000/05/15 19:05:25	1.30
+++ servers/slapd/root_dse.c	2000/05/30 19:34:56	1.36
@@ -1,4 +1,4 @@
-/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.29 2000/05/15 14:33:07 kurt Exp $ */
+/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.35 2000/05/22 01:46:58 kurt Exp $ */
 /* root_dse.c - Provides the ROOT DSA-Specific Entry
  *
  * Copyright 1999-2000 The OpenLDAP Foundation.
@@ -17,8 +17,8 @@
 
 #include "slap.h"
 
-void
-root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
+int
+root_dse_info( Entry **entry, const char **text )
 {
 	char buf[BUFSIZ];
 	Entry		*e;
@@ -26,6 +26,24 @@ root_dse_info( Connection *conn, Operati
 	struct berval	*vals[2];
 	int		i, j;
 
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+	AttributeDescription *ad_objectClass = 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 = slap_schema.si_ad_supportedLDAPVersion;
+	AttributeDescription *ad_supportedSASLMechanisms = slap_schema.si_ad_supportedSASLMechanisms;
+	AttributeDescription *ad_ref = slap_schema.si_ad_ref;
+#else
+	char *ad_objectClass = "objectClass";
+	char *ad_namingContexts = "namingContexts";
+	char *ad_supportedControl = "supportedControl";
+	char *ad_supportedExtension = "supportedExtension";
+	char *ad_supportedLDAPVersion = "supportedLDAPVersion";
+	char *ad_supportedSASLMechanisms = "supportedSASLMechanisms";
+	char *ad_ref = "ref";
+#endif
+
 	vals[0] = &val;
 	vals[1] = NULL;
 
@@ -37,11 +55,19 @@ root_dse_info( Connection *conn, Operati
 	(void) dn_normalize( e->e_ndn );
 	e->e_private = NULL;
 
+	val.bv_val = "top";
+	val.bv_len = sizeof("top")-1;
+	attr_merge( e, ad_objectClass, vals );
+
+	val.bv_val = "OpenLDAProotDSE";
+	val.bv_len = sizeof("OpenLDAProotDSE")-1;
+	attr_merge( e, ad_objectClass, vals );
+
 	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, slap_schema.si_ad_namingContexts, vals );
+			attr_merge( e, ad_namingContexts, vals );
 		}
 	}
 
@@ -51,13 +77,13 @@ root_dse_info( Connection *conn, Operati
 	for ( i=0; supportedControls[i] != NULL; i++ ) {
 		val.bv_val = supportedControls[i];
 		val.bv_len = strlen( val.bv_val );
-		attr_merge( e, slap_schema.si_ad_supportedControl, vals );
+		attr_merge( e, ad_supportedControl, vals );
 	}
 
 	/* supportedExtension */
 	for ( i=0; (val.bv_val = get_supported_extop(i)) != NULL; i++ ) {
 		val.bv_len = strlen( val.bv_val );
-		attr_merge( e, slap_schema.si_ad_supportedExtension, vals );
+		attr_merge( e, ad_supportedExtension, vals );
 	}
 
 	/* supportedLDAPVersion */
@@ -65,7 +91,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, slap_schema.si_ad_supportedLDAPVersion, vals );
+		attr_merge( e, ad_supportedLDAPVersion, vals );
 	}
 
 	/* supportedSASLMechanism */
@@ -73,36 +99,15 @@ 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, slap_schema.si_ad_supportedSASLMechanisms, vals );
+			attr_merge( e, 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, slap_schema.si_ad_ref, default_referral );
+		attr_merge( e, ad_ref, default_referral );
 	}
 
-	val.bv_val = "top";
-	val.bv_len = sizeof("top")-1;
-	attr_merge( e, slap_schema.si_ad_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 );
-
-	entry_free( e );
+	*entry = e;
+	return LDAP_SUCCESS;
 }