Use SLAP_MONITOR(be) to check flag

servers/slapd/back-monitor/database.c

@@ -126,7 +126,7 @@ monitor_subsys_database_init(
 			return( -1 );
 		}
 		
-		if ( be->be_flags & SLAP_BFLAG_MONITOR ) {
+		if ( SLAP_MONITOR(be) ) {
 			attr_merge( e, slap_schema.si_ad_monitorContext,
 					be->be_suffix, be->be_nsuffix );
 			attr_merge( e_database, slap_schema.si_ad_monitorContext,

servers/slapd/root_dse.c

@@ -124,7 +124,7 @@ root_dse_info(
 			/* no suffix! */
 			continue;
 		}
-		if ( backends[i].be_flags & SLAP_BFLAG_MONITOR ) {
+		if ( SLAP_MONITOR( backends[i].be_flags )) {
 			vals[0] = backends[i].be_suffix[0];
 			nvals[0] = backends[i].be_nsuffix[0];
 			if( attr_merge( e, ad_monitorContext, vals, nvals ) ) {