Use "uri" directive (instead of "server") to specify server. Add "bin

[openldap] / servers / slapd / root_dse.c

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index 0a89fa13f89630e112a4d9b2d968937d8cd3ee11..7fd02e5eb9cb6ab532f66baa5db3436b7955c77a 100644 (file)
--- 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;
@@ -33,9 +33,6 @@ root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
        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";
@@ -44,9 +41,6 @@ root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
        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
 
@@ -65,8 +59,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 +103,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;
 }