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 fbaa475e68b30fbae5fe1001e3ef34ccc60b732e..5d688c936dbb0fb9ed022b8e2bc82d28521c7bc5 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -74,8 +74,7 @@ root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
        }
 
        /* supportedExtension */
-       for ( i=0; (val.bv_val = get_supported_extension(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 );
        }