/* backend.c - deals with backend subsystem */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
/*
- * Copyright 2001 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- *
* Copyright 2001, Pierangelo Masarati, All rights reserved. <ando@sys-net.it>
*
* This work has beed deveolped for the OpenLDAP Foundation
Entry *e, *e_backend, *e_tmp;
int i;
struct monitorentrypriv *mp;
- struct berval *bv[2], val;
mi = ( struct monitorinfo * )be->be_private;
if ( monitor_cache_get( mi,
- monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn,
+ &monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn,
&e_backend ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_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 ));
#else
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_backend_init: "
"unable to get entry '%s'\n%s%s",
- monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn->bv_val,
+ monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val,
"", "" );
#endif
return( -1 );
}
- bv[0] = &val;
- bv[1] = 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"
- "objectClass: top\n"
- "objectClass: LDAPsubEntry\n"
-#ifdef SLAPD_MONITORSUBENTRY
- "objectClass: monitorSubEntry\n"
-#else /* !SLAPD_MONITORSUBENTRY */
- "objectClass: extensibleObject\n"
-#endif /* !SLAPD_MONITORSUBENTRY */
- "cn: %d\n",
+ "dn: cn=Backend %d,%s\n"
+ SLAPD_MONITOR_OBJECTCLASSES
+ "cn: Backend %d\n",
i,
- monitor_subsys[SLAPD_MONITOR_BACKEND].mss_dn->bv_val,
+ monitor_subsys[SLAPD_MONITOR_BACKEND].mss_dn.bv_val,
i );
e = str2entry( buf );
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
"monitor_subsys_backend_init: "
- "unable to create entry 'cn=%d,%s'\n",
+ "unable to create entry 'cn=Backend %d,%s'\n",
i,
- monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn->bv_val ));
+ monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val ));
#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,
+ monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val,
"" );
#endif
return( -1 );
}
- val.bv_val = bi->bi_type;
- val.bv_len = strlen( val.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 );
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
"monitor_subsys_backend_init: "
- "unable to add entry 'cn=%d,%s'\n",
+ "unable to add entry 'cn=Backend %d,%s'\n",
i,
- monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn->bv_val ));
+ monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val ));
#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,
+ monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val,
"" );
#endif
return( -1 );