--- servers/slapd/root_dse.c	2000/05/16 16:13:08	1.33
+++ servers/slapd/root_dse.c	2000/06/06 17:43:20	1.37
@@ -1,4 +1,4 @@
-/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.32 2000/05/16 14:22:52 kurt Exp $ */
+/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.36 2000/05/30 19:34:56 kurt Exp $ */
 /* root_dse.c - Provides the ROOT DSA-Specific Entry
  *
  * Copyright 1999-2000 The OpenLDAP Foundation.
@@ -18,7 +18,7 @@
 #include "slap.h"
 
 int
-root_dse_info( Entry **entry, char **text )
+root_dse_info( Entry **entry, const char **text )
 {
 	char buf[BUFSIZ];
 	Entry		*e;
@@ -26,29 +26,13 @@ root_dse_info( Entry **entry, char **tex
 	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;
-#ifdef SLAPD_ACI_ENABLED
-	AttributeDescription *ad_supportedACIMechanisms = slap_schema.si_ad_supportedACIMechanisms;
-#endif
 	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";
-#ifdef SLAPD_ACI_ENABLED
-	char *ad_supportedACIMechanisms = "supportedACIMechanisms";
-#endif
-	char *ad_ref = "ref";
-#endif
 
 	vals[0] = &val;
 	vals[1] = NULL;
@@ -109,14 +93,6 @@ root_dse_info( Entry **entry, char **tex
 		}
 	}
 
-#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, ad_supportedACIMechanisms, vals );
-	}
-#endif
-
 	if ( default_referral != NULL ) {
 		attr_merge( e, ad_ref, default_referral );
 	}