Per ITS#419, don't require SLAPD_RLOOKUPS when HAVE_TCPD

[openldap] / servers / slapd / root_dse.c

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index d30e6e3869df738a40c1e2251bd718c1cc182107..5d688c936dbb0fb9ed022b8e2bc82d28521c7bc5 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -34,7 +34,7 @@ root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
        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++ ) {
@@ -74,8 +74,7 @@ root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
        }
 
        /* 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 );
        }
@@ -97,6 +96,14 @@ 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, "supportedACIMechanisms", vals );
+       }
+#endif
+
        if ( default_referral != NULL ) {
                attr_merge( e, "ref", default_referral );
        }
@@ -105,8 +112,8 @@ root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
        val.bv_len = sizeof("top")-1;
        attr_merge( e, "objectClass", vals );
 
-       val.bv_val = "LDAPsubentry";
-       val.bv_len = sizeof("LDAPsubentry")-1;
+       val.bv_val = "LDAProotDSE";
+       val.bv_len = sizeof("LDAProotDSE")-1;
        attr_merge( e, "objectClass", vals );
 
        val.bv_val = "extensibleObject";