ITS#9664 Add normalised suffix into rootDSE for ACL, etc.

This was removed in ITS#5540 since there was no EQUALITY matching rule,
but that situation changed in ITS#8341 and we need to add it back.

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index 1c7be7261006049883101fd140bd85d36b6c4de7..47b2852e762d59e882181f828482f3c1b4b01cba 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -278,12 +278,9 @@ fail:
                if ( SLAP_GLUE_SUBORDINATE( be ) && !SLAP_GLUE_ADVERTISE( be ) ) {
                        continue;
                }
-               for ( j = 0; be->be_suffix[j].bv_val != NULL; j++ ) {
-                       if( attr_merge_one( e, ad_namingContexts,
-                                       &be->be_suffix[j], NULL ) )
-                       {
-                               goto fail;
-                       }
+               if ( attr_merge( e, ad_namingContexts,
+                               be->be_suffix, be->be_nsuffix ) ) {
+                       goto fail;
                }
        }