X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-monitor%2Fdatabase.c;h=de4294d986fa2424a703067d6783d7eb9256a2db;hb=966cef8c9a3238efe0c482ad0ee08fd98944d112;hp=91747ab3e3cc03d96d53e365678c57330458be4c;hpb=acbb5cf689a4336af05c9f259d909d8141055bac;p=openldap
diff --git a/servers/slapd/back-monitor/database.c b/servers/slapd/back-monitor/database.c
index 91747ab3e3..de4294d986 100644
--- a/servers/slapd/back-monitor/database.c
+++ b/servers/slapd/back-monitor/database.c
@@ -2,7 +2,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software .
*
- * Copyright 2001-2006 The OpenLDAP Foundation.
+ * Copyright 2001-2011 The OpenLDAP Foundation.
* Portions Copyright 2001-2003 Pierangelo Masarati.
* All rights reserved.
*
@@ -33,30 +33,6 @@
static int monitor_back_add_plugin( monitor_info_t *mi, Backend *be, Entry *e );
#endif /* defined(LDAP_SLAPI) */
-#if defined(SLAPD_BDB)
-#include "../back-bdb/back-bdb.h"
-#endif /* defined(SLAPD_BDB) */
-#if defined(SLAPD_HDB)
-#include "../back-hdb/back-bdb.h"
-#endif /* defined(SLAPD_HDB) */
-#if defined(SLAPD_LDAP)
-#include "../back-ldap/back-ldap.h"
-#endif /* defined(SLAPD_LDAP) */
-#if 0 && defined(SLAPD_LDBM)
-#include "../back-ldbm/back-ldbm.h"
-#endif /* defined(SLAPD_LDBM) */
-#if defined(SLAPD_META)
-#include "../back-meta/back-meta.h"
-#endif /* defined(SLAPD_META) */
-
-/* for PATH_MAX on some systems (e.g. Solaris) */
-#ifdef HAVE_LIMITS_H
-#include
-#endif /* HAVE_LIMITS_H */
-#ifndef PATH_MAX
-#define PATH_MAX 4095
-#endif /* ! PATH_MAX */
-
static int
monitor_subsys_database_modify(
Operation *op,
@@ -79,8 +55,8 @@ static struct restricted_ops_t {
}, restricted_exops[] = {
{ BER_BVC( LDAP_EXOP_START_TLS ), SLAP_RESTRICT_EXOP_START_TLS },
{ BER_BVC( LDAP_EXOP_MODIFY_PASSWD ), SLAP_RESTRICT_EXOP_MODIFY_PASSWD },
- { BER_BVC( LDAP_EXOP_X_WHO_AM_I ), SLAP_RESTRICT_EXOP_WHOAMI },
- { BER_BVC( LDAP_EXOP_X_CANCEL ), SLAP_RESTRICT_EXOP_CANCEL },
+ { BER_BVC( LDAP_EXOP_WHO_AM_I ), SLAP_RESTRICT_EXOP_WHOAMI },
+ { BER_BVC( LDAP_EXOP_CANCEL ), SLAP_RESTRICT_EXOP_CANCEL },
{ BER_BVNULL, 0 }
};
@@ -90,7 +66,7 @@ init_readOnly( monitor_info_t *mi, Entry *e, slap_mask_t restrictops )
struct berval *tf = ( ( restrictops & SLAP_RESTRICT_OP_MASK ) == SLAP_RESTRICT_OP_WRITES ) ?
(struct berval *)&slap_true_bv : (struct berval *)&slap_false_bv;
- return attr_merge_one( e, mi->mi_ad_readOnly, tf, tf );
+ return attr_merge_one( e, mi->mi_ad_readOnly, tf, NULL );
}
static int
@@ -123,409 +99,523 @@ init_restrictedOperation( monitor_info_t *mi, Entry *e, slap_mask_t restrictops
return LDAP_SUCCESS;
}
-int
-monitor_subsys_database_init(
+static int
+monitor_subsys_overlay_init_one(
+ monitor_info_t *mi,
BackendDB *be,
- monitor_subsys_t *ms
-)
+ monitor_subsys_t *ms,
+ monitor_subsys_t *ms_overlay,
+ slap_overinst *on,
+ Entry *e_database,
+ Entry **ep_overlay )
{
- monitor_info_t *mi;
- Entry *e_database, **ep;
- int i;
- monitor_entry_t *mp;
- monitor_subsys_t *ms_backend,
- *ms_overlay;
+ char buf[ BACKMONITOR_BUFSIZE ];
+ int j, o;
+ Entry *e_overlay;
+ slap_overinst *on2;
+ slap_overinfo *oi = NULL;
+ BackendInfo *bi;
+ monitor_entry_t *mp_overlay;
+ struct berval bv;
- assert( be != NULL );
+ assert( overlay_is_over( be ) );
- ms->mss_modify = monitor_subsys_database_modify;
+ oi = (slap_overinfo *)be->bd_info->bi_private;
+ bi = oi->oi_orig;
- mi = ( monitor_info_t * )be->be_private;
+ /* find the overlay number, o */
+ for ( o = 0, on2 = oi->oi_list; on2 && on2 != on; on2 = on2->on_next, o++ )
+ ;
- ms_backend = monitor_back_get_subsys( SLAPD_MONITOR_BACKEND_NAME );
- if ( ms_backend == NULL ) {
- Debug( LDAP_DEBUG_ANY,
- "monitor_subsys_database_init: "
- "unable to get "
- "\"" SLAPD_MONITOR_BACKEND_NAME "\" "
- "subsystem\n",
- 0, 0, 0 );
+ if ( on2 == NULL ) {
return -1;
}
- ms_overlay = monitor_back_get_subsys( SLAPD_MONITOR_OVERLAY_NAME );
- if ( ms_overlay == NULL ) {
- Debug( LDAP_DEBUG_ANY,
- "monitor_subsys_database_init: "
- "unable to get "
- "\"" SLAPD_MONITOR_OVERLAY_NAME "\" "
- "subsystem\n",
- 0, 0, 0 );
- return -1;
+ /* find the overlay type number, j */
+ for ( on2 = overlay_next( NULL ), j = 0; on2; on2 = overlay_next( on2 ), j++ ) {
+ if ( on2->on_bi.bi_type == on->on_bi.bi_type ) {
+ break;
+ }
}
+ assert( on2 != NULL );
- if ( monitor_cache_get( mi, &ms->mss_ndn, &e_database ) ) {
+ bv.bv_len = snprintf( buf, sizeof( buf ), "cn=Overlay %d", o );
+ bv.bv_val = buf;
+
+ e_overlay = monitor_entry_stub( &e_database->e_name, &e_database->e_nname, &bv,
+ mi->mi_oc_monitoredObject, mi, NULL, NULL );
+
+ if ( e_overlay == NULL ) {
Debug( LDAP_DEBUG_ANY,
- "monitor_subsys_database_init: "
- "unable to get entry \"%s\"\n",
- ms->mss_ndn.bv_val, 0, 0 );
+ "monitor_subsys_overlay_init_one: "
+ "unable to create entry "
+ "\"cn=Overlay %d,%s\"\n",
+ o, e_database->e_name.bv_val, 0 );
return( -1 );
}
+ ber_str2bv( on->on_bi.bi_type, 0, 0, &bv );
+ attr_merge_normalize_one( e_overlay, mi->mi_ad_monitoredInfo, &bv, NULL );
- (void)init_readOnly( mi, e_database, frontendDB->be_restrictops );
- (void)init_restrictedOperation( mi, e_database, frontendDB->be_restrictops );
+ bv.bv_len = snprintf( buf, sizeof( buf ), "cn=Overlay %d,%s",
+ j, ms_overlay->mss_dn.bv_val );
+ bv.bv_val = buf;
+ attr_merge_normalize_one( e_overlay, slap_schema.si_ad_seeAlso,
+ &bv, NULL );
- mp = ( monitor_entry_t * )e_database->e_private;
- mp->mp_children = NULL;
- ep = &mp->mp_children;
+ if ( SLAP_MONITOR( be ) ) {
+ attr_merge( e_overlay, slap_schema.si_ad_monitorContext,
+ be->be_suffix, be->be_nsuffix );
- i = -1;
- LDAP_STAILQ_FOREACH( be, &backendDB, be_next ) {
- char buf[ BACKMONITOR_BUFSIZE ];
- int j;
- slap_overinfo *oi = NULL;
- BackendInfo *bi, *bi2;
- Entry *e;
+ } else {
+ attr_merge( e_overlay, slap_schema.si_ad_namingContexts,
+ be->be_suffix, NULL );
+ }
- i++;
+ mp_overlay = monitor_entrypriv_create();
+ if ( mp_overlay == NULL ) {
+ return -1;
+ }
+ e_overlay->e_private = ( void * )mp_overlay;
+ mp_overlay->mp_info = ms;
+ mp_overlay->mp_flags = ms->mss_flags | MONITOR_F_SUB;
+
+ if ( monitor_cache_add( mi, e_overlay ) ) {
+ Debug( LDAP_DEBUG_ANY,
+ "monitor_subsys_overlay_init_one: "
+ "unable to add entry "
+ "\"cn=Overlay %d,%s\"\n",
+ o, e_database->e_name.bv_val, 0 );
+ return -1;
+ }
- bi = be->bd_info;
+ *ep_overlay = e_overlay;
+ ep_overlay = &mp_overlay->mp_next;
- if ( overlay_is_over( be ) ) {
- oi = (slap_overinfo *)be->bd_info->bi_private;
- bi = oi->oi_orig;
- }
+ return 0;
+}
- /* Subordinates are not exposed as their own naming context */
- if ( SLAP_GLUE_SUBORDINATE( be ) ) {
- continue;
- }
+static int
+monitor_subsys_database_init_one(
+ monitor_info_t *mi,
+ BackendDB *be,
+ monitor_subsys_t *ms,
+ monitor_subsys_t *ms_backend,
+ monitor_subsys_t *ms_overlay,
+ struct berval *rdn,
+ Entry *e_database,
+ Entry ***epp )
+{
+ char buf[ BACKMONITOR_BUFSIZE ];
+ int j;
+ slap_overinfo *oi = NULL;
+ BackendInfo *bi, *bi2;
+ Entry *e;
+ monitor_entry_t *mp;
+ char *rdnval = strchr( rdn->bv_val, '=' ) + 1;
+ struct berval bv;
- snprintf( buf, sizeof( buf ),
- "dn: cn=Database %d,%s\n"
- "objectClass: %s\n"
- "structuralObjectClass: %s\n"
- "cn: Database %d\n"
- "%s: %s\n"
- "%s: %s\n"
- "creatorsName: %s\n"
- "modifiersName: %s\n"
- "createTimestamp: %s\n"
- "modifyTimestamp: %s\n",
- i,
- ms->mss_dn.bv_val,
- mi->mi_oc_monitoredObject->soc_cname.bv_val,
- mi->mi_oc_monitoredObject->soc_cname.bv_val,
- i,
- mi->mi_ad_monitoredInfo->ad_cname.bv_val,
- bi->bi_type,
- mi->mi_ad_monitorIsShadow->ad_cname.bv_val,
- SLAP_SHADOW( be ) ? slap_true_bv.bv_val : slap_false_bv.bv_val,
- mi->mi_creatorsName.bv_val,
- mi->mi_creatorsName.bv_val,
- mi->mi_startTime.bv_val,
- mi->mi_startTime.bv_val );
-
- e = str2entry( buf );
- if ( e == NULL ) {
+ bi = be->bd_info;
+
+ if ( overlay_is_over( be ) ) {
+ oi = (slap_overinfo *)be->bd_info->bi_private;
+ bi = oi->oi_orig;
+ }
+
+ e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, rdn,
+ mi->mi_oc_monitoredObject, mi, NULL, NULL );
+
+ if ( e == NULL ) {
+ Debug( LDAP_DEBUG_ANY,
+ "monitor_subsys_database_init_one: "
+ "unable to create entry \"%s,%s\"\n",
+ rdn->bv_val, ms->mss_dn.bv_val, 0 );
+ return( -1 );
+ }
+
+ ber_str2bv( bi->bi_type, 0, 0, &bv );
+ attr_merge_normalize_one( e, mi->mi_ad_monitoredInfo, &bv, NULL );
+ attr_merge_one( e, mi->mi_ad_monitorIsShadow,
+ SLAP_SHADOW( be ) ? (struct berval *)&slap_true_bv :
+ (struct berval *)&slap_false_bv, NULL );
+
+ if ( SLAP_MONITOR( be ) ) {
+ attr_merge( e, slap_schema.si_ad_monitorContext,
+ be->be_suffix, be->be_nsuffix );
+ attr_merge( e_database, slap_schema.si_ad_monitorContext,
+ be->be_suffix, be->be_nsuffix );
+
+ } else {
+ if ( be->be_suffix == NULL ) {
Debug( LDAP_DEBUG_ANY,
- "monitor_subsys_database_init: "
- "unable to create entry \"cn=Database %d,%s\"\n",
- i, ms->mss_dn.bv_val, 0 );
- return( -1 );
+ "monitor_subsys_database_init_one: "
+ "missing suffix for %s\n",
+ rdnval, 0, 0 );
+ } else {
+ attr_merge( e, slap_schema.si_ad_namingContexts,
+ be->be_suffix, NULL );
+ attr_merge( e_database, slap_schema.si_ad_namingContexts,
+ be->be_suffix, NULL );
}
-
- if ( SLAP_MONITOR( be ) ) {
- attr_merge( e, slap_schema.si_ad_monitorContext,
- be->be_suffix, be->be_nsuffix );
- attr_merge( e_database, slap_schema.si_ad_monitorContext,
- be->be_suffix, be->be_nsuffix );
- } else {
- if ( be->be_suffix == NULL ) {
+ if ( SLAP_GLUE_SUBORDINATE( be ) ) {
+ BackendDB *sup_be = select_backend( &be->be_nsuffix[ 0 ], 1 );
+ if ( sup_be == NULL ) {
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_database_init: "
- "missing suffix for database %d\n",
- i, 0, 0 );
- return -1;
+ "unable to get superior for %s\n",
+ be->be_suffix[ 0 ].bv_val, 0, 0 );
+
+ } else {
+ attr_merge( e, mi->mi_ad_monitorSuperiorDN,
+ sup_be->be_suffix, sup_be->be_nsuffix );
}
- attr_merge( e, slap_schema.si_ad_namingContexts,
- be->be_suffix, be->be_nsuffix );
- attr_merge( e_database, slap_schema.si_ad_namingContexts,
- be->be_suffix, be->be_nsuffix );
}
+ }
- (void)init_readOnly( mi, e, be->be_restrictops );
- (void)init_restrictedOperation( mi, e, be->be_restrictops );
+ (void)init_readOnly( mi, e, be->be_restrictops );
+ (void)init_restrictedOperation( mi, e, be->be_restrictops );
- if ( SLAP_SHADOW( be ) && be->be_update_refs ) {
- attr_merge_normalize( e, mi->mi_ad_monitorUpdateRef,
- be->be_update_refs, NULL );
- }
+ if ( SLAP_SHADOW( be ) && be->be_update_refs ) {
+ attr_merge_normalize( e, mi->mi_ad_monitorUpdateRef,
+ be->be_update_refs, NULL );
+ }
- if ( oi != NULL ) {
- slap_overinst *on = oi->oi_list,
- *on1 = on;
+ if ( oi != NULL ) {
+ slap_overinst *on = oi->oi_list,
+ *on1 = on;
- for ( ; on; on = on->on_next ) {
- struct berval bv;
- slap_overinst *on2;
+ for ( ; on; on = on->on_next ) {
+ slap_overinst *on2;
- for ( on2 = on1; on2 != on; on2 = on2->on_next ) {
- if ( on2->on_bi.bi_type == on->on_bi.bi_type ) {
- break;
- }
+ for ( on2 = on1; on2 != on; on2 = on2->on_next ) {
+ if ( on2->on_bi.bi_type == on->on_bi.bi_type ) {
+ break;
}
+ }
- if ( on2 != on ) {
+ if ( on2 != on ) {
+ break;
+ }
+
+ ber_str2bv( on->on_bi.bi_type, 0, 0, &bv );
+ attr_merge_normalize_one( e, mi->mi_ad_monitorOverlay,
+ &bv, NULL );
+
+ /* find the overlay number, j */
+ for ( on2 = overlay_next( NULL ), j = 0; on2; on2 = overlay_next( on2 ), j++ ) {
+ if ( on2->on_bi.bi_type == on->on_bi.bi_type ) {
break;
}
-
- ber_str2bv( on->on_bi.bi_type, 0, 0, &bv );
- attr_merge_normalize_one( e, mi->mi_ad_monitorOverlay,
- &bv, NULL );
-
- /* find the overlay number, j */
- for ( on2 = overlay_next( NULL ), j = 0; on2; on2 = overlay_next( on2 ), j++ ) {
- if ( on2->on_bi.bi_type == on->on_bi.bi_type ) {
- break;
- }
- }
- assert( on2 != NULL );
-
- snprintf( buf, sizeof( buf ),
- "cn=Overlay %d,%s",
- j, ms_overlay->mss_dn.bv_val );
- ber_str2bv( buf, 0, 0, &bv );
- attr_merge_normalize_one( e,
- slap_schema.si_ad_seeAlso,
- &bv, NULL );
}
+ assert( on2 != NULL );
+
+ snprintf( buf, sizeof( buf ),
+ "cn=Overlay %d,%s",
+ j, ms_overlay->mss_dn.bv_val );
+ ber_str2bv( buf, 0, 0, &bv );
+ attr_merge_normalize_one( e,
+ slap_schema.si_ad_seeAlso,
+ &bv, NULL );
}
+ }
+ j = -1;
+ LDAP_STAILQ_FOREACH( bi2, &backendInfo, bi_next ) {
+ j++;
+ if ( bi2->bi_type == bi->bi_type ) {
+ snprintf( buf, sizeof( buf ),
+ "cn=Backend %d,%s",
+ j, ms_backend->mss_dn.bv_val );
+ bv.bv_val = buf;
+ bv.bv_len = strlen( buf );
+ attr_merge_normalize_one( e,
+ slap_schema.si_ad_seeAlso,
+ &bv, NULL );
+ break;
+ }
+ }
+ /* we must find it! */
+ assert( j >= 0 );
- if ( 0 ) {
- assert( 0 );
-
-#if defined(SLAPD_BDB) || defined(SLAPD_HDB)
- } else if ( strcmp( bi->bi_type, "bdb" ) == 0
- || strcmp( bi->bi_type, "hdb" ) == 0 )
- {
- struct berval bv;
- ber_len_t pathlen = 0, len = 0;
- char path[ PATH_MAX ] = { '\0' };
- struct bdb_info *bdb = (struct bdb_info *) be->be_private;
- char *fname = bdb->bi_dbenv_home;
-
- len = strlen( fname );
- if ( fname[ 0 ] != '/' ) {
- /* get full path name */
- getcwd( path, sizeof( path ) );
- pathlen = strlen( path );
-
- if ( fname[ 0 ] == '.' && fname[ 1 ] == '/' ) {
- fname += 2;
- len -= 2;
- }
- }
+ mp = monitor_entrypriv_create();
+ if ( mp == NULL ) {
+ return -1;
+ }
+ e->e_private = ( void * )mp;
+ mp->mp_info = ms;
+ mp->mp_flags = ms->mss_flags
+ | MONITOR_F_SUB;
- bv.bv_len = STRLENOF( "file://" ) + pathlen
- + STRLENOF( "/" ) + len;
- bv.bv_val = ch_malloc( bv.bv_len + STRLENOF( "/" ) + 1 );
- AC_MEMCPY( bv.bv_val, "file://", STRLENOF( "file://" ) );
- if ( pathlen ) {
- AC_MEMCPY( &bv.bv_val[ STRLENOF( "file://" ) ],
- path, pathlen );
- bv.bv_val[ STRLENOF( "file://" ) + pathlen ] = '/';
- pathlen++;
- }
- AC_MEMCPY( &bv.bv_val[ STRLENOF( "file://" ) + pathlen ],
- fname, len );
- if ( bv.bv_val[ bv.bv_len - 1 ] != '/' ) {
- bv.bv_val[ bv.bv_len ] = '/';
- bv.bv_len++;
- }
- bv.bv_val[ bv.bv_len ] = '\0';
+ if ( monitor_cache_add( mi, e ) ) {
+ Debug( LDAP_DEBUG_ANY,
+ "monitor_subsys_database_init_one: "
+ "unable to add entry \"%s,%s\"\n",
+ rdn->bv_val, ms->mss_dn.bv_val, 0 );
+ return( -1 );
+ }
- attr_merge_normalize_one( e, slap_schema.si_ad_labeledURI,
- &bv, NULL );
+#if defined(LDAP_SLAPI)
+ monitor_back_add_plugin( mi, be, e );
+#endif /* defined(LDAP_SLAPI) */
+
+ if ( oi != NULL ) {
+ Entry **ep_overlay = &mp->mp_children;
+ slap_overinst *on = oi->oi_list;
- ch_free( bv.bv_val );
+ for ( ; on; on = on->on_next ) {
+ monitor_subsys_overlay_init_one( mi, be,
+ ms, ms_overlay, on, e, ep_overlay );
+ }
+ }
-#endif /* defined(SLAPD_BDB) || defined(SLAPD_HDB) */
-#if defined(SLAPD_LDAP)
- } else if ( strcmp( bi->bi_type, "ldap" ) == 0 ) {
- ldapinfo_t *li = (ldapinfo_t *)be->be_private;
-#if 0
- attr_merge_normalize( e, slap_schema.si_ad_labeledURI,
- li->li_bvuri, NULL );
-#else
- char **urls = ldap_str2charray( li->li_uri, " " );
+ **epp = e;
+ *epp = &mp->mp_next;
- if ( urls != NULL ) {
- int u;
+ return 0;
+}
- for ( u = 0; urls[ u ] != NULL; u++ ) {
- struct berval bv;
+static int
+monitor_back_register_database_and_overlay(
+ BackendDB *be,
+ struct slap_overinst *on,
+ struct berval *ndn_out )
+{
+ monitor_info_t *mi;
+ Entry *e_database, **ep;
+ int i, rc;
+ monitor_entry_t *mp;
+ monitor_subsys_t *ms_backend,
+ *ms_database,
+ *ms_overlay;
+ struct berval bv;
+ char buf[ BACKMONITOR_BUFSIZE ];
- ber_str2bv( urls[ u ], 0, 0, &bv );
+ assert( be_monitor != NULL );
- attr_merge_normalize_one( e,
- slap_schema.si_ad_labeledURI,
- &bv, NULL );
- }
+ if ( !monitor_subsys_is_opened() ) {
+ if ( on ) {
+ return monitor_back_register_overlay_limbo( be, on, ndn_out );
- ldap_charray_free( urls );
- }
-#endif
+ } else {
+ return monitor_back_register_database_limbo( be, ndn_out );
+ }
+ }
-#endif /* defined(SLAPD_LDAP) */
-#if defined(SLAPD_META)
- } else if ( strcmp( bi->bi_type, "meta" ) == 0 ) {
- metainfo_t *mi = (metainfo_t *)be->be_private;
- int t;
+ mi = ( monitor_info_t * )be_monitor->be_private;
- for ( t = 0; t < mi->mi_ntargets; t++ ) {
- char **urls = ldap_str2charray( mi->mi_targets[ t ].mt_uri, " " );
+ ms_backend = monitor_back_get_subsys( SLAPD_MONITOR_BACKEND_NAME );
+ if ( ms_backend == NULL ) {
+ Debug( LDAP_DEBUG_ANY,
+ "monitor_back_register_database: "
+ "unable to get "
+ "\"" SLAPD_MONITOR_BACKEND_NAME "\" "
+ "subsystem\n",
+ 0, 0, 0 );
+ return -1;
+ }
- if ( urls != NULL ) {
- int u;
+ ms_database = monitor_back_get_subsys( SLAPD_MONITOR_DATABASE_NAME );
+ if ( ms_database == NULL ) {
+ Debug( LDAP_DEBUG_ANY,
+ "monitor_back_register_database: "
+ "unable to get "
+ "\"" SLAPD_MONITOR_DATABASE_NAME "\" "
+ "subsystem\n",
+ 0, 0, 0 );
+ return -1;
+ }
- for ( u = 0; urls[ u ] != NULL; u++ ) {
- struct berval bv;
+ ms_overlay = monitor_back_get_subsys( SLAPD_MONITOR_OVERLAY_NAME );
+ if ( ms_overlay == NULL ) {
+ Debug( LDAP_DEBUG_ANY,
+ "monitor_back_register_database: "
+ "unable to get "
+ "\"" SLAPD_MONITOR_OVERLAY_NAME "\" "
+ "subsystem\n",
+ 0, 0, 0 );
+ return -1;
+ }
- ber_str2bv( urls[ u ], 0, 0, &bv );
+ if ( monitor_cache_get( mi, &ms_database->mss_ndn, &e_database ) ) {
+ Debug( LDAP_DEBUG_ANY,
+ "monitor_subsys_database_init: "
+ "unable to get entry \"%s\"\n",
+ ms_database->mss_ndn.bv_val, 0, 0 );
+ return( -1 );
+ }
- attr_merge_normalize_one( e,
- slap_schema.si_ad_labeledURI,
- &bv, NULL );
+ mp = ( monitor_entry_t * )e_database->e_private;
+ for ( i = -1, ep = &mp->mp_children; *ep; i++ ) {
+ Attribute *a;
+
+ a = attr_find( (*ep)->e_attrs, slap_schema.si_ad_namingContexts );
+ if ( a ) {
+ int j, k;
+
+ /* FIXME: RFC 4512 defines namingContexts without an
+ * equality matching rule, making comparisons
+ * like this one tricky. We use a_vals and
+ * be_suffix instead for now.
+ */
+ for ( j = 0; !BER_BVISNULL( &a->a_vals[ j ] ); j++ ) {
+ for ( k = 0; !BER_BVISNULL( &be->be_suffix[ k ] ); k++ ) {
+ if ( dn_match( &a->a_vals[ j ],
+ &be->be_suffix[ k ] ) ) {
+ rc = 0;
+ goto done;
}
- ldap_charray_free( urls );
}
}
-#endif /* defined(SLAPD_META) */
}
- j = -1;
- LDAP_STAILQ_FOREACH( bi2, &backendInfo, bi_next ) {
- j++;
- if ( bi2->bi_type == bi->bi_type ) {
- struct berval bv;
-
- snprintf( buf, sizeof( buf ),
- "cn=Backend %d,%s",
- j, ms_backend->mss_dn.bv_val );
- bv.bv_val = buf;
- bv.bv_len = strlen( buf );
- attr_merge_normalize_one( e,
- slap_schema.si_ad_seeAlso,
- &bv, NULL );
- break;
- }
- }
- /* we must find it! */
- assert( j >= 0 );
-
- mp = monitor_entrypriv_create();
- if ( mp == NULL ) {
- return -1;
- }
- e->e_private = ( void * )mp;
- mp->mp_info = ms;
- mp->mp_flags = ms->mss_flags
- | MONITOR_F_SUB;
+ mp = ( monitor_entry_t * )(*ep)->e_private;
- if ( monitor_cache_add( mi, e ) ) {
- Debug( LDAP_DEBUG_ANY,
- "monitor_subsys_database_init: "
- "unable to add entry \"cn=Database %d,%s\"\n",
- i, ms->mss_dn.bv_val, 0 );
- return( -1 );
- }
+ assert( mp != NULL );
+ ep = &mp->mp_next;
+ }
-#if defined(LDAP_SLAPI)
- monitor_back_add_plugin( mi, be, e );
-#endif /* defined(LDAP_SLAPI) */
+ bv.bv_val = buf;
+ bv.bv_len = snprintf( buf, sizeof( buf ), "cn=Database %d", i );
+ if ( bv.bv_len >= sizeof( buf ) ) {
+ rc = -1;
+ goto done;
+ }
+
+ rc = monitor_subsys_database_init_one( mi, be,
+ ms_database, ms_backend, ms_overlay, &bv, e_database, &ep );
+ if ( rc != 0 ) {
+ goto done;
+ }
+ /* database_init_one advanced ep past where we want.
+ * But it stored the entry we want in mp->mp_next.
+ */
+ ep = &mp->mp_next;
- if ( oi != NULL ) {
- Entry **ep_overlay = &mp->mp_children;
- monitor_entry_t *mp_overlay;
- slap_overinst *on = oi->oi_list;
- int o;
+done:;
+ monitor_cache_release( mi, e_database );
+ if ( rc == 0 && ndn_out && ep && *ep ) {
+ if ( on ) {
+ Entry *e_ov;
+ struct berval ov_type;
- for ( o = 0; on; o++, on = on->on_next ) {
- Entry *e_overlay;
- slap_overinst *on2;
+ ber_str2bv( on->on_bi.bi_type, 0, 0, &ov_type );
- /* find the overlay number, j */
- for ( on2 = overlay_next( NULL ), j = 0; on2; on2 = overlay_next( on2 ), j++ ) {
- if ( on2->on_bi.bi_type == on->on_bi.bi_type ) {
- break;
- }
- }
- assert( on2 != NULL );
-
- snprintf( buf, sizeof( buf ),
- "dn: cn=Overlay %d,cn=Database %d,%s\n"
- "objectClass: %s\n"
- "structuralObjectClass: %s\n"
- "cn: Overlay %d\n"
- "%s: %s\n"
- "seeAlso: cn=Overlay %d,%s\n"
- "creatorsName: %s\n"
- "modifiersName: %s\n"
- "createTimestamp: %s\n"
- "modifyTimestamp: %s\n",
- o,
- i,
- ms->mss_dn.bv_val,
- mi->mi_oc_monitoredObject->soc_cname.bv_val,
- mi->mi_oc_monitoredObject->soc_cname.bv_val,
- o,
- mi->mi_ad_monitoredInfo->ad_cname.bv_val,
- on->on_bi.bi_type,
- j,
- ms_overlay->mss_dn.bv_val,
- mi->mi_creatorsName.bv_val,
- mi->mi_creatorsName.bv_val,
- mi->mi_startTime.bv_val,
- mi->mi_startTime.bv_val );
-
- e_overlay = str2entry( buf );
- if ( e_overlay == NULL ) {
- Debug( LDAP_DEBUG_ANY,
- "monitor_subsys_database_init: "
- "unable to create entry "
- "\"cn=Overlay %d,cn=Database %d,%s\"\n",
- o, i, ms->mss_dn.bv_val );
- return( -1 );
- }
+ mp = ( monitor_entry_t * ) (*ep)->e_private;
+ for ( e_ov = mp->mp_children; e_ov; ) {
+ Attribute *a = attr_find( e_ov->e_attrs, mi->mi_ad_monitoredInfo );
- mp_overlay = monitor_entrypriv_create();
- if ( mp_overlay == NULL ) {
- return -1;
- }
- e_overlay->e_private = ( void * )mp_overlay;
- mp_overlay->mp_info = ms;
- mp_overlay->mp_flags = ms->mss_flags
- | MONITOR_F_SUB;
-
- if ( monitor_cache_add( mi, e_overlay ) ) {
- Debug( LDAP_DEBUG_ANY,
- "monitor_subsys_database_init: "
- "unable to add entry "
- "\"cn=Overlay %d,cn=Database %d,%s\"\n",
- o, i, ms->mss_dn.bv_val );
- return( -1 );
+ if ( a != NULL && bvmatch( &a->a_nvals[ 0 ], &ov_type ) ) {
+ *ndn_out = e_ov->e_nname;
+ break;
}
- *ep_overlay = e_overlay;
- ep_overlay = &mp_overlay->mp_next;
+ mp = ( monitor_entry_t * ) e_ov->e_private;
+ e_ov = mp->mp_next;
}
+
+ } else {
+ *ndn_out = (*ep)->e_nname;
}
+ }
- *ep = e;
- ep = &mp->mp_next;
+ return rc;
+}
+
+int
+monitor_back_register_database(
+ BackendDB *be,
+ struct berval *ndn_out )
+{
+ return monitor_back_register_database_and_overlay( be, NULL, ndn_out );
+}
+
+int
+monitor_back_register_overlay(
+ BackendDB *be,
+ struct slap_overinst *on,
+ struct berval *ndn_out )
+{
+ return monitor_back_register_database_and_overlay( be, on, ndn_out );
+}
+
+int
+monitor_subsys_database_init(
+ BackendDB *be,
+ monitor_subsys_t *ms )
+{
+ monitor_info_t *mi;
+ Entry *e_database, **ep;
+ int i, rc;
+ monitor_entry_t *mp;
+ monitor_subsys_t *ms_backend,
+ *ms_overlay;
+ struct berval bv;
+
+ assert( be != NULL );
+
+ ms->mss_modify = monitor_subsys_database_modify;
+
+ mi = ( monitor_info_t * )be->be_private;
+
+ ms_backend = monitor_back_get_subsys( SLAPD_MONITOR_BACKEND_NAME );
+ if ( ms_backend == NULL ) {
+ Debug( LDAP_DEBUG_ANY,
+ "monitor_subsys_database_init: "
+ "unable to get "
+ "\"" SLAPD_MONITOR_BACKEND_NAME "\" "
+ "subsystem\n",
+ 0, 0, 0 );
+ return -1;
+ }
+
+ ms_overlay = monitor_back_get_subsys( SLAPD_MONITOR_OVERLAY_NAME );
+ if ( ms_overlay == NULL ) {
+ Debug( LDAP_DEBUG_ANY,
+ "monitor_subsys_database_init: "
+ "unable to get "
+ "\"" SLAPD_MONITOR_OVERLAY_NAME "\" "
+ "subsystem\n",
+ 0, 0, 0 );
+ return -1;
+ }
+
+ if ( monitor_cache_get( mi, &ms->mss_ndn, &e_database ) ) {
+ Debug( LDAP_DEBUG_ANY,
+ "monitor_subsys_database_init: "
+ "unable to get entry \"%s\"\n",
+ ms->mss_ndn.bv_val, 0, 0 );
+ return( -1 );
+ }
+
+ (void)init_readOnly( mi, e_database, frontendDB->be_restrictops );
+ (void)init_restrictedOperation( mi, e_database, frontendDB->be_restrictops );
+
+ mp = ( monitor_entry_t * )e_database->e_private;
+ mp->mp_children = NULL;
+ ep = &mp->mp_children;
+
+ BER_BVSTR( &bv, "cn=Frontend" );
+ rc = monitor_subsys_database_init_one( mi, frontendDB,
+ ms, ms_backend, ms_overlay, &bv, e_database, &ep );
+ if ( rc != 0 ) {
+ return rc;
+ }
+
+ i = -1;
+ LDAP_STAILQ_FOREACH( be, &backendDB, be_next ) {
+ char buf[ BACKMONITOR_BUFSIZE ];
+
+ bv.bv_val = buf;
+ bv.bv_len = snprintf( buf, sizeof( buf ), "cn=Database %d", ++i );
+ if ( bv.bv_len >= sizeof( buf ) ) {
+ return -1;
+ }
+
+ rc = monitor_subsys_database_init_one( mi, be,
+ ms, ms_backend, ms_overlay, &bv, e_database, &ep );
+ if ( rc != 0 ) {
+ return rc;
+ }
}
monitor_cache_release( mi, e_database );
@@ -828,6 +918,7 @@ monitor_subsys_database_modify(
BER_BVZERO( &a->a_vals[ k - 1 ] );
BER_BVZERO( &a->a_nvals[ k - 1 ] );
+ a->a_numvals--;
}
}
}
@@ -853,9 +944,16 @@ monitor_subsys_database_modify(
BER_BVZERO( &a->a_vals[ k - 1 ] );
BER_BVZERO( &a->a_nvals[ k - 1 ] );
+ a->a_numvals--;
}
}
}
+
+ if ( a->a_vals == NULL ) {
+ assert( a->a_numvals == 0 );
+
+ attr_delete( &e->e_attrs, mi->mi_ad_restrictedOperation );
+ }
}
}
@@ -919,17 +1017,21 @@ monitor_back_add_plugin( monitor_info_t *mi, Backend *be, Entry *e_database )
if ( rc != LDAP_SUCCESS ) {
goto done;
}
-
- snprintf( buf, sizeof(buf),
- "plugin %d name: %s; "
- "vendor: %s; "
- "version: %s; "
- "description: %s",
- i,
- srchdesc->spd_id,
- srchdesc->spd_vendor,
- srchdesc->spd_version,
- srchdesc->spd_description );
+ if ( srchdesc ) {
+ snprintf( buf, sizeof(buf),
+ "plugin %d name: %s; "
+ "vendor: %s; "
+ "version: %s; "
+ "description: %s",
+ i,
+ srchdesc->spd_id,
+ srchdesc->spd_vendor,
+ srchdesc->spd_version,
+ srchdesc->spd_description );
+ } else {
+ snprintf( buf, sizeof(buf),
+ "plugin %d name: ", i );
+ }
ber_str2bv( buf, 0, 0, &bv );
attr_merge_normalize_one( e_database,