X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-monitor%2Foperational.c;h=75ca5e69d283799a44caba19b469e864833bace8;hb=44abcdfa2fd10362ea5bf46fdc6acd6875fcc0b8;hp=3fc3d9689c4d34bc97ec22a2357008585e4eff21;hpb=b94d5e17e22b58b990dac4d4af5319be915366a6;p=openldap

diff --git a/servers/slapd/back-monitor/operational.c b/servers/slapd/back-monitor/operational.c
index 3fc3d9689c..75ca5e69d2 100644
--- a/servers/slapd/back-monitor/operational.c
+++ b/servers/slapd/back-monitor/operational.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2001-2004 The OpenLDAP Foundation.
+ * Copyright 2001-2006 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -41,24 +41,24 @@ monitor_back_operational(
 {
 	Attribute	**ap;
 
-	assert( rs->sr_entry );
+	assert( rs->sr_entry != NULL );
 
 	for ( ap = &rs->sr_operational_attrs; *ap; ap = &(*ap)->a_next )
 		/* just count */ ;
 
-	if ( rs->sr_opattrs == SLAP_OPATTRS ||
+	if ( SLAP_OPATTRS( rs->sr_attr_flags ) ||
 			ad_inlist( slap_schema.si_ad_hasSubordinates, rs->sr_attrs ) )
 	{
 		int			hs;
-		struct monitorentrypriv	*mp;
+		monitor_entry_t	*mp;
 
-		mp = ( struct monitorentrypriv * )rs->sr_entry->e_private;
+		mp = ( monitor_entry_t * )rs->sr_entry->e_private;
 
-		assert( mp );
+		assert( mp != NULL );
 
 		hs = MONITOR_HAS_CHILDREN( mp );
 		*ap = slap_operational_hasSubordinate( hs );
-		assert( *ap );
+		assert( *ap != NULL );
 		ap = &(*ap)->a_next;
 	}