/* 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-2011 The OpenLDAP Foundation.
* Portions Copyright 2001-2003 Pierangelo Masarati.
* All rights reserved.
*
*/
int
monitor_subsys_overlay_init(
- BackendDB *be
+ BackendDB *be,
+ monitor_subsys_t *ms
)
{
- struct monitorinfo *mi;
- Entry *e, *e_overlay, *e_tmp;
+ monitor_info_t *mi;
+ Entry *e_overlay, **ep;
int i;
- struct monitorentrypriv *mp;
+ monitor_entry_t *mp;
slap_overinst *on;
+ monitor_subsys_t *ms_database;
- mi = ( struct monitorinfo * )be->be_private;
+ mi = ( monitor_info_t * )be->be_private;
- if ( monitor_cache_get( mi,
- &monitor_subsys[SLAPD_MONITOR_OVERLAY].mss_ndn,
- &e_overlay ) ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, CRIT,
- "monitor_subsys_overlay_init: "
- "unable to get entry '%s'\n",
- monitor_subsys[SLAPD_MONITOR_OVERLAY].mss_ndn.bv_val, 0, 0 );
-#else
+ 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_overlay ) ) {
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_overlay_init: "
- "unable to get entry '%s'\n%s%s",
- monitor_subsys[SLAPD_MONITOR_OVERLAY].mss_ndn.bv_val,
- "", "" );
-#endif
+ "unable to get entry \"%s\"\n",
+ ms->mss_ndn.bv_val, 0, 0 );
return( -1 );
}
- e_tmp = NULL;
+ mp = ( monitor_entry_t * )e_overlay->e_private;
+ mp->mp_children = NULL;
+ ep = &mp->mp_children;
+
for ( on = overlay_next( NULL ), i = 0; on; on = overlay_next( on ), i++ ) {
char buf[ BACKMONITOR_BUFSIZE ];
struct berval bv;
int j;
+ Entry *e;
+ BackendDB *be;
- snprintf( buf, sizeof( buf ),
- "dn: cn=Overlay %d,%s\n"
- "objectClass: %s\n"
- "structuralObjectClass: %s\n"
- "cn: Overlay %d\n"
- "createTimestamp: %s\n"
- "modifyTimestamp: %s\n",
- i,
- monitor_subsys[SLAPD_MONITOR_OVERLAY].mss_dn.bv_val,
- mi->mi_oc_monitoredObject->soc_cname.bv_val,
- mi->mi_oc_monitoredObject->soc_cname.bv_val,
- i,
- mi->mi_startTime.bv_val,
- mi->mi_startTime.bv_val );
-
- e = str2entry( buf );
+ bv.bv_len = snprintf( buf, sizeof( buf ), "cn=Overlay %d", i );
+ bv.bv_val = buf;
+ e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &bv,
+ mi->mi_oc_monitoredObject, mi, NULL, NULL );
if ( e == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, CRIT,
- "monitor_subsys_overlay_init: "
- "unable to create entry 'cn=Overlay %d,%s'\n",
- i, monitor_subsys[SLAPD_MONITOR_OVERLAY].mss_ndn.bv_val, 0 );
-#else
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_overlay_init: "
- "unable to create entry 'cn=Overlay %d,%s'\n%s",
- i,
- monitor_subsys[SLAPD_MONITOR_OVERLAY].mss_ndn.bv_val,
- "" );
-#endif
+ "unable to create entry \"cn=Overlay %d,%s\"\n",
+ i, ms->mss_ndn.bv_val, 0 );
return( -1 );
}
+ ber_str2bv( on->on_bi.bi_type, 0, 0, &bv );
+ attr_merge_normalize_one( e, mi->mi_ad_monitoredInfo, &bv, NULL );
+ attr_merge_normalize_one( e, mi->mi_ad_monitorRuntimeConfig,
+ on->on_bi.bi_cf_ocs ? (struct berval *)&slap_true_bv :
+ (struct berval *)&slap_false_bv, NULL );
- bv.bv_val = on->on_bi.bi_type;
- bv.bv_len = strlen( bv.bv_val );
-
- attr_merge_normalize_one( e, mi->mi_ad_monitoredInfo,
- &bv, NULL );
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)->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;
}
snprintf( buf, sizeof( buf ), "cn=Database %d,%s",
- j, monitor_subsys[SLAPD_MONITOR_DATABASE].mss_dn.bv_val );
- dn.bv_val = buf;
- dn.bv_len = strlen( buf );
+ j, ms_database->mss_dn.bv_val );
- attr_merge_normalize_one( e, mi->mi_ad_seeAlso,
+ ber_str2bv( buf, 0, 0, &dn );
+ attr_merge_normalize_one( e, slap_schema.si_ad_seeAlso,
&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 = e_tmp;
- mp->mp_children = NULL;
- mp->mp_info = &monitor_subsys[SLAPD_MONITOR_OVERLAY];
- mp->mp_flags = monitor_subsys[SLAPD_MONITOR_OVERLAY].mss_flags
+ mp->mp_info = ms;
+ mp->mp_flags = ms->mss_flags
| MONITOR_F_SUB;
if ( monitor_cache_add( mi, e ) ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, CRIT,
- "monitor_subsys_overlay_init: "
- "unable to add entry 'cn=Overlay %d,%s'\n",
- i, monitor_subsys[SLAPD_MONITOR_OVERLAY].mss_ndn.bv_val, 0 );
-#else
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_overlay_init: "
- "unable to add entry 'cn=Overlay %d,%s'\n%s",
- i,
- monitor_subsys[SLAPD_MONITOR_OVERLAY].mss_ndn.bv_val,
- "" );
-#endif
+ "unable to add entry \"cn=Overlay %d,%s\"\n",
+ i, ms->mss_ndn.bv_val, 0 );
return( -1 );
}
- e_tmp = e;
+ *ep = e;
+ ep = &mp->mp_next;
}
- mp = ( struct monitorentrypriv * )e_overlay->e_private;
- mp->mp_children = e_tmp;
-
monitor_cache_release( mi, e_overlay );
return( 0 );
projects / openldap / blobdiff