/* overlay.c - deals with overlay subsystem */
/* 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.
*
*/
int
monitor_subsys_overlay_init(
- BackendDB *be,
- monitorsubsys *ms
+ BackendDB *be,
+ monitor_subsys_t *ms
)
{
- struct monitorinfo *mi;
+ monitor_info_t *mi;
Entry *e_overlay, **ep;
int i;
- struct monitorentrypriv *mp;
+ monitor_entry_t *mp;
slap_overinst *on;
- monitorsubsys *ms_database;
+ monitor_subsys_t *ms_database;
- 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 ) {
return -1;
}
- if ( monitor_cache_get( mi,
- &ms->mss_ndn,
- &e_overlay ) )
- {
+ if ( monitor_cache_get( mi, &ms->mss_ndn, &e_overlay ) ) {
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_overlay_init: "
"unable to get entry \"%s\"\n",
return( -1 );
}
- mp = ( struct monitorentrypriv * )e_overlay->e_private;
+ mp = ( monitor_entry_t * )e_overlay->e_private;
mp->mp_children = NULL;
ep = &mp->mp_children;
struct berval bv;
int j;
Entry *e;
+ BackendDB *be;
snprintf( buf, sizeof( buf ),
"dn: cn=Overlay %d,%s\n"
attr_merge_normalize_one( e_overlay, mi->mi_ad_monitoredInfo,
&bv, NULL );
- 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;
- slap_overinst *on2;
- if ( strcmp( be->bd_info->bi_type, "over" ) != 0 ) {
- continue;
- }
-
- on2 = ((slap_overinfo *)be->bd_info->bi_private)->oi_list;
- for ( ; on2; on2 = on2->on_next ) {
- if ( on2->on_bi.bi_type == on->on_bi.bi_type ) {
- break;
- }
- }
-
- if ( on2 == NULL ) {
+ j++;
+ if ( !overlay_is_inst( be, on->on_bi.bi_type ) ) {
continue;
}