From 2958925ca172e27c751dfea43338d5fa70ce2b74 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ond=C5=99ej=20Kuzn=C3=ADk?= Date: Wed, 8 Sep 2021 16:17:06 +0100 Subject: [PATCH] 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. --- servers/slapd/root_dse.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c index 1c7be72610..47b2852e76 100644 --- 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; } } -- 2.47.3