Merge remote branch 'origin/mdb.master'

[openldap] / servers / slapd / back-monitor / overlay.c

diff --git a/servers/slapd/back-monitor/overlay.c b/servers/slapd/back-monitor/overlay.c
index 7610a6f8018fee80c49fe8fb085678c6023b92b1..3a563df6cd35e5e2d4adc69f58d2feb31f82edde 100644 (file)
--- a/servers/slapd/back-monitor/overlay.c
+++ b/servers/slapd/back-monitor/overlay.c
@@ -1,7 +1,7 @@
 /* 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-2012 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -32,18 +32,18 @@
  */
 int
 monitor_subsys_overlay_init(
-       BackendDB       *be,
-       monitorsubsys   *ms
+       BackendDB               *be,
+       monitor_subsys_t        *ms
 )
 {
-       struct monitorinfo      *mi;
+       monitor_info_t          *mi;
        Entry                   *e_overlay, **ep;
        int                     i;
-       struct monitorentrypriv *mp;
+       monitor_entry_t         *mp;
        slap_overinst           *on;
-       monitorsubsys           *ms_database;
+       monitor_subsys_t        *ms_database;
 
-       mi = ( struct monitorinfo * )be->be_private;
+       mi = ( monitor_info_t * )be->be_private;
 
        ms_database = monitor_back_get_subsys( SLAPD_MONITOR_DATABASE_NAME );
        if ( ms_database == NULL ) {
@@ -56,10 +56,7 @@ monitor_subsys_overlay_init(
                return -1;
        }
 
-       if ( monitor_cache_get( mi, 
-                               &ms->mss_ndn, 
-                               &e_overlay ) )
-       {
+       if ( monitor_cache_get( mi, &ms->mss_ndn, &e_overlay ) ) {
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_overlay_init: "
                        "unable to get entry \"%s\"\n",
@@ -67,7 +64,7 @@ monitor_subsys_overlay_init(
                return( -1 );
        }
 
-       mp = ( struct monitorentrypriv * )e_overlay->e_private;
+       mp = ( monitor_entry_t * )e_overlay->e_private;
        mp->mp_children = NULL;
        ep = &mp->mp_children;
 
@@ -76,27 +73,12 @@ monitor_subsys_overlay_init(
                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"
-                               "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_creatorsName.bv_val,
-                               mi->mi_creatorsName.bv_val,
-                               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 ) {
                        Debug( LDAP_DEBUG_ANY,
                                "monitor_subsys_overlay_init: "
@@ -104,49 +86,38 @@ monitor_subsys_overlay_init(
                                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->bi_private)->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, ms_database->mss_dn.bv_val );
-                       dn.bv_val = buf;
-                       dn.bv_len = strlen( buf );
 
-                       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 = NULL;
-               mp->mp_children = NULL;
                mp->mp_info = ms;
                mp->mp_flags = ms->mss_flags
                        | MONITOR_F_SUB;