X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Froot_dse.c;h=f987948c1e5506a9b94c84dd43ec00ba9f7bd461;hb=517fa54bb0f764968ca56e7931a09adac4f33af6;hp=0a89fa13f89630e112a4d9b2d968937d8cd3ee11;hpb=73b48936a7fc57f77de66260df699f22bf01aa26;p=openldap

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index 0a89fa13f8..f987948c1e 100644
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -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,29 +26,13 @@ root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
 	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;
@@ -65,8 +49,8 @@ root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
 	val.bv_len = sizeof("top")-1;
 	attr_merge( e, ad_objectClass, vals );
 
-	val.bv_val = "LDAProotDSE";
-	val.bv_len = sizeof("LDAProotDSE")-1;
+	val.bv_val = "OpenLDAProotDSE";
+	val.bv_len = sizeof("OpenLDAProotDSE")-1;
 	attr_merge( e, ad_objectClass, vals );
 
 	for ( i = 0; i < nbackends; i++ ) {
@@ -109,24 +93,11 @@ root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
 		}
 	}
 
-#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 );
 	}
 
-	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;
 }