honor disclose

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

diff --git a/servers/slapd/back-monitor/backend.c b/servers/slapd/back-monitor/backend.c
index c0c61b95fef06c76aec7d1004d142f5fdf4e4bdf..b9e608435807ae3a4d5a91e72e354e51999cbb6f 100644 (file)
--- a/servers/slapd/back-monitor/backend.c
+++ b/servers/slapd/back-monitor/backend.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-2005 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -33,39 +33,52 @@
  */
 int
 monitor_subsys_backend_init(
-       BackendDB       *be
+       BackendDB               *be,
+       monitor_subsys_t        *ms
 )
 {
-       struct monitorinfo      *mi;
+       monitor_info_t          *mi;
        Entry                   *e_backend, **ep;
        int                     i;
-       struct monitorentrypriv *mp;
+       monitor_entry_t         *mp;
+       monitor_subsys_t        *ms_database;
+       BackendInfo                     *bi;
 
-       mi = ( struct monitorinfo * )be->be_private;
+       mi = ( monitor_info_t * )be->be_private;
 
-       if ( monitor_cache_get( mi, 
-                               &monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn, 
-                               &e_backend ) )
+       ms_database = monitor_back_get_subsys( SLAPD_MONITOR_DATABASE_NAME );
+       if ( ms_database == NULL ) {
+               Debug( LDAP_DEBUG_ANY,
+                       "monitor_subsys_backend_init: "
+                       "unable to get "
+                       "\"" SLAPD_MONITOR_DATABASE_NAME "\" "
+                       "subsystem\n",
+                       0, 0, 0 );
+               return -1;
+       }
+
+       if ( monitor_cache_get( mi, &ms->mss_ndn, &e_backend ) )
        {
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_backend_init: "
                        "unable to get entry \"%s\"\n",
-                       monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val, 0, 0 );
+                       ms->mss_ndn.bv_val, 0, 0 );
                return( -1 );
        }
 
-       mp = ( struct monitorentrypriv * )e_backend->e_private;
+       mp = ( monitor_entry_t * )e_backend->e_private;
        mp->mp_children = NULL;
        ep = &mp->mp_children;
 
-       for ( i = 0; i < nBackendInfo; i++ ) {
+       i = -1;
+       LDAP_STAILQ_FOREACH( bi, &backendInfo, bi_next ) {
                char            buf[ BACKMONITOR_BUFSIZE ];
-               BackendInfo     *bi;
+               BackendDB               *be;
                struct berval   bv;
                int             j;
                Entry           *e;
 
-               bi = &backendInfo[i];
+               i++;
 
                snprintf( buf, sizeof( buf ),
                                "dn: cn=Backend %d,%s\n"
@@ -77,7 +90,7 @@ monitor_subsys_backend_init(
                                "createTimestamp: %s\n"
                                "modifyTimestamp: %s\n",
                                i,
-                               monitor_subsys[SLAPD_MONITOR_BACKEND].mss_dn.bv_val,
+                               ms->mss_dn.bv_val,
                                mi->mi_oc_monitoredObject->soc_cname.bv_val,
                                mi->mi_oc_monitoredObject->soc_cname.bv_val,
                                i,
@@ -91,7 +104,7 @@ monitor_subsys_backend_init(
                        Debug( LDAP_DEBUG_ANY,
                                "monitor_subsys_backend_init: "
                                "unable to create entry \"cn=Backend %d,%s\"\n",
-                               i, monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val, 0 );
+                               i, ms->mss_ndn.bv_val, 0 );
                        return( -1 );
                }
                
@@ -113,17 +126,19 @@ monitor_subsys_backend_init(
                        }
                }
 
-               for ( j = 0; j < nBackendDB; j++ ) {
-                       BackendDB       *be = &backendDB[j];
+               j = -1;
+               LDAP_STAILQ_FOREACH( be, &backendDB, be_next ) {
                        char            buf[ SLAP_LDAPDN_MAXLEN ];
                        struct berval   dn;
                        
+                       j++;
+
                        if ( be->bd_info != bi ) {
                                continue;
                        }
 
                        snprintf( buf, sizeof( buf ), "cn=Database %d,%s",
-                                       j, monitor_subsys[SLAPD_MONITOR_DATABASE].mss_dn.bv_val );
+                                       j, ms_database->mss_dn.bv_val );
                        dn.bv_val = buf;
                        dn.bv_len = strlen( buf );
 
@@ -131,20 +146,20 @@ monitor_subsys_backend_init(
                                        &dn, NULL );
                }
                
-               mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
+               mp = monitor_entrypriv_create();
+               if ( mp == NULL ) {
+                       return -1;
+               }
                e->e_private = ( void * )mp;
-               mp->mp_next = NULL;
-               mp->mp_children = NULL;
-               mp->mp_info = &monitor_subsys[SLAPD_MONITOR_BACKEND];
-               mp->mp_flags = monitor_subsys[SLAPD_MONITOR_BACKEND].mss_flags
-                       | MONITOR_F_SUB;
+               mp->mp_info = ms;
+               mp->mp_flags = ms->mss_flags | MONITOR_F_SUB;
 
                if ( monitor_cache_add( mi, e ) ) {
                        Debug( LDAP_DEBUG_ANY,
                                "monitor_subsys_backend_init: "
                                "unable to add entry \"cn=Backend %d,%s\"\n",
                                i,
-                               monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val, 0 );
+                               ms->mss_ndn.bv_val, 0 );
                        return( -1 );
                }