From: Pierangelo Masarati <ando@openldap.org>
Date: Wed, 19 Jun 2002 07:57:01 +0000 (+0000)
Subject: use monitorContext for the monitor database
X-Git-Tag: NO_SLAP_OP_BLOCKS~1406
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=93dbac3caf22866b41caf5ab75ebdb79fcfa37f0;p=openldap

use monitorContext for the monitor database
---

diff --git a/servers/slapd/back-monitor/database.c b/servers/slapd/back-monitor/database.c
index bfc1eded08..66b0b0bce4 100644
--- a/servers/slapd/back-monitor/database.c
+++ b/servers/slapd/back-monitor/database.c
@@ -48,6 +48,7 @@ monitor_subsys_database_init(
 	int			i;
 	struct monitorentrypriv	*mp;
 	AttributeDescription 	*ad_nc = slap_schema.si_ad_namingContexts;
+	AttributeDescription 	*ad_mc = slap_schema.si_ad_monitorContext;
 	AttributeDescription 	*ad_seeAlso = NULL;
 	const char		*text = NULL;
 
@@ -114,8 +115,13 @@ monitor_subsys_database_init(
 			return( -1 );
 		}
 		
-		attr_merge( e, ad_nc, be->be_suffix );
-		attr_merge( e_database, ad_nc, be->be_suffix );
+		if ( be->be_flags & SLAP_BFLAG_MONITOR ) {
+			attr_merge( e, ad_mc, be->be_suffix );
+			attr_merge( e_database, ad_mc, be->be_suffix );
+		} else {
+			attr_merge( e, ad_nc, be->be_suffix );
+			attr_merge( e_database, ad_nc, be->be_suffix );
+		}
 
 		for ( j = nBackendInfo; j--; ) {
 			if ( &backendInfo[ j ] == be->bd_info ) {