#include <ac/string.h>
#include "slap.h"
+#include "lber_pvt.h"
#include "back-monitor.h"
/*
struct monitorsubsys monitor_subsys[] = {
{
SLAPD_MONITOR_LISTENER, SLAPD_MONITOR_LISTENER_NAME,
- { 0L, NULL }, { 0L, NULL }, { 0L, NULL },
+ BER_BVNULL, BER_BVNULL, BER_BVNULL,
MONITOR_F_PERSISTENT_CH,
monitor_subsys_listener_init,
NULL, /* update */
NULL /* modify */
}, {
SLAPD_MONITOR_DATABASE, SLAPD_MONITOR_DATABASE_NAME,
- { 0L, NULL }, { 0L, NULL }, { 0L, NULL },
+ BER_BVNULL, BER_BVNULL, BER_BVNULL,
MONITOR_F_PERSISTENT_CH,
monitor_subsys_database_init,
NULL, /* update */
NULL /* modify */
}, {
SLAPD_MONITOR_BACKEND, SLAPD_MONITOR_BACKEND_NAME,
- { 0L, NULL }, { 0L, NULL }, { 0L, NULL },
+ BER_BVNULL, BER_BVNULL, BER_BVNULL,
MONITOR_F_PERSISTENT_CH,
monitor_subsys_backend_init,
NULL, /* update */
NULL /* modify */
}, {
SLAPD_MONITOR_THREAD, SLAPD_MONITOR_THREAD_NAME,
- { 0L, NULL }, { 0L, NULL }, { 0L, NULL },
+ BER_BVNULL, BER_BVNULL, BER_BVNULL,
MONITOR_F_NONE,
monitor_subsys_thread_init,
monitor_subsys_thread_update,
NULL /* modify */
}, {
SLAPD_MONITOR_SASL, SLAPD_MONITOR_SASL_NAME,
- { 0L, NULL }, { 0L, NULL }, { 0L, NULL },
+ BER_BVNULL, BER_BVNULL, BER_BVNULL,
MONITOR_F_NONE,
NULL, /* init */
NULL, /* update */
NULL /* modify */
}, {
SLAPD_MONITOR_TLS, SLAPD_MONITOR_TLS_NAME,
- { 0L, NULL }, { 0L, NULL }, { 0L, NULL },
+ BER_BVNULL, BER_BVNULL, BER_BVNULL,
MONITOR_F_NONE,
NULL, /* init */
NULL, /* update */
NULL /* modify */
}, {
SLAPD_MONITOR_CONN, SLAPD_MONITOR_CONN_NAME,
- { 0L, NULL }, { 0L, NULL }, { 0L, NULL },
+ BER_BVNULL, BER_BVNULL, BER_BVNULL,
MONITOR_F_VOLATILE_CH,
monitor_subsys_conn_init,
monitor_subsys_conn_update,
NULL /* modify */
}, {
SLAPD_MONITOR_READW, SLAPD_MONITOR_READW_NAME,
- { 0L, NULL }, { 0L, NULL }, { 0L, NULL },
+ BER_BVNULL, BER_BVNULL, BER_BVNULL,
MONITOR_F_NONE,
NULL, /* init */
monitor_subsys_readw_update,
NULL /* modify */
}, {
SLAPD_MONITOR_WRITEW, SLAPD_MONITOR_WRITEW_NAME,
- { 0L, NULL }, { 0L, NULL }, { 0L, NULL },
+ BER_BVNULL, BER_BVNULL, BER_BVNULL,
MONITOR_F_NONE,
NULL, /* init */
monitor_subsys_writew_update,
NULL /* modify */
}, {
SLAPD_MONITOR_LOG, SLAPD_MONITOR_LOG_NAME,
- { 0L, NULL }, { 0L, NULL }, { 0L, NULL },
+ BER_BVNULL, BER_BVNULL, BER_BVNULL,
MONITOR_F_NONE,
monitor_subsys_log_init,
NULL, /* update */
monitor_subsys_log_modify
}, {
SLAPD_MONITOR_OPS, SLAPD_MONITOR_OPS_NAME,
- { 0L, NULL }, { 0L, NULL }, { 0L, NULL },
- MONITOR_F_NONE,
+ BER_BVNULL, BER_BVNULL, BER_BVNULL,
+ MONITOR_F_PERSISTENT_CH,
monitor_subsys_ops_init,
monitor_subsys_ops_update,
NULL, /* create */
NULL, /* modify */
}, {
SLAPD_MONITOR_SENT, SLAPD_MONITOR_SENT_NAME,
- { 0L, NULL }, { 0L, NULL }, { 0L, NULL },
- MONITOR_F_NONE,
+ BER_BVNULL, BER_BVNULL, BER_BVNULL,
+ MONITOR_F_PERSISTENT_CH,
monitor_subsys_sent_init,
monitor_subsys_sent_update,
NULL, /* create */
NULL, /* modify */
+ }, {
+ SLAPD_MONITOR_TIME, SLAPD_MONITOR_TIME_NAME,
+ BER_BVNULL, BER_BVNULL, BER_BVNULL,
+ MONITOR_F_PERSISTENT_CH,
+ monitor_subsys_time_init,
+ monitor_subsys_time_update,
+ NULL, /* create */
+ NULL, /* modify */
}, { -1, NULL }
};
+#ifdef SLAPD_MONITOR_DYNAMIC
+
+int
+back_monitor_LTX_init_module( int argc, char *argv[] )
+{
+ BackendInfo bi;
+
+ memset( &bi, '\0', sizeof(bi) );
+ bi.bi_type = "monitor";
+ bi.bi_init = monitor_back_initialize;
+ backend_add( &bi );
+ return 0;
+}
+
+#endif /* SLAPD_MONITOR_DYNAMIC */
+
int
monitor_back_initialize(
BackendInfo *bi
{
static char *controls[] = {
LDAP_CONTROL_MANAGEDSAIT,
+ LDAP_CONTROL_VALUESRETURNFILTER,
NULL
};
bi->bi_controls = controls;
bi->bi_init = 0;
- bi->bi_open = monitor_back_open;
+ bi->bi_open = 0;
bi->bi_config = monitor_back_config;
bi->bi_close = 0;
bi->bi_destroy = 0;
bi->bi_db_init = monitor_back_db_init;
bi->bi_db_config = monitor_back_db_config;
- bi->bi_db_open = 0;
+ bi->bi_db_open = monitor_back_db_open;
bi->bi_db_close = 0;
bi->bi_db_destroy = monitor_back_db_destroy;
struct monitorentrypriv *mp;
int i, rc;
char buf[1024], *end_of_line;
- struct berval dn, *ndn;
+ struct berval dn, ndn;
const char *text;
struct berval bv[2];
*/
if ( be_monitor ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
- "only one monitor backend is allowed\n" ));
+ LDAP_LOG( OPERATION, CRIT,
+ "only one monitor backend is allowed\n" , 0, 0, 0);
#else
Debug( LDAP_DEBUG_ANY,
"only one monitor backend is allowed\n%s%s%s",
/* indicate system schema supported */
be->be_flags |= SLAP_BFLAG_MONITOR;
- ndn = NULL;
dn.bv_val = SLAPD_MONITOR_DN;
dn.bv_len = sizeof( SLAPD_MONITOR_DN ) - 1;
- rc = dnNormalize( NULL, &dn, &ndn );
+ rc = dnNormalize2( NULL, &dn, &ndn );
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
- "monitor DN \"" SLAPD_MONITOR_DN "\" backend is allowed\n" ));
+ LDAP_LOG( OPERATION, CRIT,
+ "monitor DN \"" SLAPD_MONITOR_DN "\" backend is allowed\n" , 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"monitor DN \"" SLAPD_MONITOR_DN "\" backend is allowed\n",
return -1;
}
- ber_bvecadd( &be->be_suffix, ber_dupbv( NULL, &dn ) );
- ber_bvecadd( &be->be_nsuffix, ndn );
+ ber_dupbv( &bv[0], &dn );
+ ber_bvarray_add( &be->be_suffix, &bv[0] );
+ ber_bvarray_add( &be->be_nsuffix, &ndn );
mi = ( struct monitorinfo * )ch_calloc( sizeof( struct monitorinfo ), 1 );
ldap_pvt_thread_mutex_init( &mi->mi_cache_mutex );
if ( slap_str2ad( "description", &monitor_ad_desc, &text ) ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
- "monitor_back_db_init: %s\n", text ));
+ LDAP_LOG( OPERATION, CRIT,
+ "monitor_back_db_init: %s\n", text, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_backend_init: %s\n%s%s",
free( dn.bv_val );
if ( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ LDAP_LOG( OPERATION, CRIT,
"monitor RDN \"%s\" is invalid\n",
- dn.bv_val ));
+ dn.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"monitor RDN \"%s\" is invalid\n",
free( dn.bv_val );
if ( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ LDAP_LOG( OPERATION, CRIT,
"monitor DN \"%s\" is invalid\n",
- dn.bv_val ));
+ dn.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"monitor DN \"%s\" is invalid\n",
if ( e == NULL) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ LDAP_LOG( OPERATION, CRIT,
"unable to create '%s' entry\n",
- monitor_subsys[ i ].mss_dn.bv_val ));
+ monitor_subsys[ i ].mss_dn.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"unable to create '%s' entry\n",
if ( monitor_cache_add( mi, e ) ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ LDAP_LOG( OPERATION, CRIT,
"unable to add entry '%s' to cache\n",
- monitor_subsys[ i ].mss_dn.bv_val ));
+ monitor_subsys[ i ].mss_dn.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"unable to add entry '%s' to cache\n",
e = str2entry( buf );
if ( e == NULL) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ LDAP_LOG( OPERATION, CRIT,
"unable to create '%s' entry\n",
- SLAPD_MONITOR_DN ));
+ SLAPD_MONITOR_DN, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"unable to create '%s' entry\n%s%s",
}
if ( attr_merge( e, monitor_ad_desc, bv ) ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ LDAP_LOG( OPERATION, CRIT,
"unable to add description to '%s' entry\n",
- SLAPD_MONITOR_DN ));
+ SLAPD_MONITOR_DN, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"unable to add description to '%s' entry\n%s%s",
if ( monitor_cache_add( mi, e ) ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ LDAP_LOG( OPERATION, CRIT,
"unable to add entry '%s' to cache\n",
- SLAPD_MONITOR_DN ));
+ SLAPD_MONITOR_DN, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"unable to add entry '%s' to cache\n%s%s",
}
int
-monitor_back_open(
- BackendInfo *bi
+monitor_back_db_open(
+ BackendDB *be
)
{
- BackendDB *be;
struct monitorsubsys *ms;
- struct berval dn = { sizeof(SLAPD_MONITOR_DN)-1, SLAPD_MONITOR_DN };
- struct berval ndn;
- int rc;
+
+ assert( be );
/*
- * adds the monitor backend
+ * opens the monitor backend
*/
- rc = dnNormalize2( NULL, &dn, &ndn );
- if( rc != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
- "monitor DN \"" SLAPD_MONITOR_DN "\" is invalid\n" ));
-#else
- Debug( LDAP_DEBUG_ANY,
- "monitor DN \"" SLAPD_MONITOR_DN "\" is invalid\n",
- 0, 0, 0 );
-#endif
- return( -1 );
- }
-
- be = select_backend( &ndn , 0, 0 );
- free( ndn.bv_val );
-
- if ( be == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
- "unable to get monitor backend\n" ));
-#else
- Debug( LDAP_DEBUG_ANY,
- "unable to get monitor backend\n", 0, 0, 0 );
-#endif
- return( -1 );
- }
-
for ( ms = monitor_subsys; ms->mss_name != NULL; ms++ ) {
if ( ms->mss_init && ( *ms->mss_init )( be ) ) {
return( -1 );
char **argv
)
{
+ /*
+ * eventually, will hold database specific configuration parameters
+ */
#ifdef NEW_LOGGING
- LDAP_LOG(( "config", LDAP_DEBUG_NOTICE,
- "line %d of file '%s' will be ignored\n", lineno, fname ));
+ LDAP_LOG( CONFIG, INFO,
+ "line %d of file '%s' will be ignored\n", lineno, fname, 0 );
#else
Debug( LDAP_DEBUG_CONFIG,
"line %d of file '%s' will be ignored\n%s", lineno, fname, "" );
projects / openldap / blobdiff