Entry *e, *e_backend, *e_tmp;
int i;
struct monitorentrypriv *mp;
- struct berval bv[2];
mi = ( struct monitorinfo * )be->be_private;
&monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn,
&e_backend ) ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ LDAP_LOG( OPERATION, CRIT,
"monitor_subsys_backend_init: "
"unable to get entry '%s'\n",
- monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val ));
+ monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_backend_init: "
return( -1 );
}
- bv[1].bv_val = NULL;
e_tmp = NULL;
for ( i = nBackendInfo; i--; ) {
- char buf[1024];
- BackendInfo *bi;
+ char buf[1024];
+ BackendInfo *bi;
+ struct berval bv[ 2 ];
bi = &backendInfo[i];
snprintf( buf, sizeof( buf ),
- "dn: cn=%d,%s\n"
+ "dn: cn=Backend %d,%s\n"
SLAPD_MONITOR_OBJECTCLASSES
- "cn: %d\n",
+ "cn: Backend %d\n",
i,
monitor_subsys[SLAPD_MONITOR_BACKEND].mss_dn.bv_val,
i );
e = str2entry( buf );
if ( e == NULL ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ LDAP_LOG( OPERATION, CRIT,
"monitor_subsys_backend_init: "
- "unable to create entry 'cn=%d,%s'\n",
- i,
- monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val ));
+ "unable to create entry 'cn=Backend %d,%s'\n",
+ i, monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_backend_init: "
- "unable to create entry 'cn=%d,%s'\n%s",
+ "unable to create entry 'cn=Backend %d,%s'\n%s",
i,
monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val,
"" );
bv[0].bv_val = bi->bi_type;
bv[0].bv_len = strlen( bv[0].bv_val );
+ bv[1].bv_val = NULL;
attr_merge( e, monitor_ad_desc, bv );
attr_merge( e_backend, monitor_ad_desc, bv );
+
+ if ( bi->bi_controls ) {
+ int j;
+
+ for ( j = 0; bi->bi_controls[ j ]; j++ ) {
+ bv[0].bv_val = bi->bi_controls[ j ];
+ bv[0].bv_len = strlen( bv[0].bv_val );
+ attr_merge( e, slap_schema.si_ad_supportedControl, bv );
+ }
+ }
mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
e->e_private = ( void * )mp;
if ( monitor_cache_add( mi, e ) ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ LDAP_LOG( OPERATION, CRIT,
"monitor_subsys_backend_init: "
- "unable to add entry 'cn=%d,%s'\n",
- i,
- monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val ));
+ "unable to add entry 'cn=Backend %d,%s'\n",
+ i, monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_backend_init: "
- "unable to add entry 'cn=%d,%s'\n%s",
+ "unable to add entry 'cn=Backend %d,%s'\n%s",
i,
monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val,
"" );