Merge remote branch 'origin/mdb.master'

[openldap] / servers / slapd / back-monitor / database.c

diff --git a/servers/slapd/back-monitor/database.c b/servers/slapd/back-monitor/database.c
index 68811f44a6d889cefabf968f9b96f862a5f2e269..a9ea11d22514a466d3afe1ed2dca2d94d84d28b2 100644 (file)
--- a/servers/slapd/back-monitor/database.c
+++ b/servers/slapd/back-monitor/database.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2001-2009 The OpenLDAP Foundation.
+ * Copyright 2001-2012 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -143,7 +143,7 @@ monitor_subsys_overlay_init_one(
        bv.bv_val = buf;
 
        e_overlay = monitor_entry_stub( &e_database->e_name, &e_database->e_nname, &bv,
-               mi->mi_oc_monitoredObject, mi, NULL, NULL );
+               mi->mi_oc_monitoredObject, NULL, NULL );
 
        if ( e_overlay == NULL ) {
                Debug( LDAP_DEBUG_ANY,
@@ -222,7 +222,7 @@ monitor_subsys_database_init_one(
        }
 
        e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, rdn,
-               mi->mi_oc_monitoredObject, mi, NULL, NULL );
+               mi->mi_oc_monitoredObject, NULL, NULL );
 
        if ( e == NULL ) {
                Debug( LDAP_DEBUG_ANY,
@@ -502,7 +502,7 @@ done:;
 
                        mp = ( monitor_entry_t * ) (*ep)->e_private;
                        for ( e_ov = mp->mp_children; e_ov; ) {
-                               Attribute *a = attr_find( e_ov, mi->mi_ad_monitoredInfo );
+                               Attribute *a = attr_find( e_ov->e_attrs, mi->mi_ad_monitoredInfo );
 
                                if ( a != NULL && bvmatch( &a->a_nvals[ 0 ], &ov_type ) ) {
                                        *ndn_out = e_ov->e_nname;