ITS#8341 Allow normalised values for namingContexts in cn=monitor

diff --git a/servers/slapd/back-monitor/database.c b/servers/slapd/back-monitor/database.c
index 34d21dd6d18b01f6d47e745cd824dbacd1603aa2..611d9f50461df13cbe6751e5b86247bba6924fad 100644 (file)
--- a/servers/slapd/back-monitor/database.c
+++ b/servers/slapd/back-monitor/database.c
@@ -168,7 +168,7 @@ monitor_subsys_overlay_init_one(
 
        } else {
                attr_merge( e_overlay, slap_schema.si_ad_namingContexts,
-                               be->be_suffix, NULL );
+                               be->be_suffix, be->be_nsuffix );
        }
 
        mp_overlay = monitor_entrypriv_create();
@@ -254,9 +254,9 @@ monitor_subsys_database_init_one(
 
        } else {
                attr_merge( e, slap_schema.si_ad_namingContexts,
-                       be->be_suffix, NULL );
+                       be->be_suffix, be->be_nsuffix );
                attr_merge( e_database, slap_schema.si_ad_namingContexts,
-                       be->be_suffix, NULL );
+                       be->be_suffix, be->be_nsuffix );
 
                if ( SLAP_GLUE_SUBORDINATE( be ) ) {
                        BackendDB *sup_be = select_backend( &be->be_nsuffix[ 0 ], 1 );