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 7bdb01736b21148dd1f69cd717b3eb1d4ea4f06b..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,17 +33,18 @@
  */
 int
 monitor_subsys_backend_init(
-       BackendDB       *be,
-       monitorsubsys   *ms
+       BackendDB               *be,
+       monitor_subsys_t        *ms
 )
 {
-       struct monitorinfo      *mi;
+       monitor_info_t          *mi;
        Entry                   *e_backend, **ep;
        int                     i;
-       struct monitorentrypriv *mp;
-       monitorsubsys           *ms_database;
+       monitor_entry_t         *mp;
+       monitor_subsys_t        *ms_database;
+       BackendInfo                     *bi;
 
-       mi = ( struct monitorinfo * )be->be_private;
+       mi = ( monitor_info_t * )be->be_private;
 
        ms_database = monitor_back_get_subsys( SLAPD_MONITOR_DATABASE_NAME );
        if ( ms_database == NULL ) {
@@ -65,18 +66,19 @@ monitor_subsys_backend_init(
                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"
@@ -124,11 +126,13 @@ 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;
                        }