]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-monitor/init.c
plug more one-time leaks; rearrange subsystems setup
[openldap] / servers / slapd / back-monitor / init.c
index a9798b963af5410e23c7a6d5a771368aeb86ab32..b665f9825b9b170d6aa6a091a7e6803d0968257b 100644 (file)
@@ -1,34 +1,22 @@
 /* init.c - initialize monitor backend */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2001-2005 The OpenLDAP Foundation.
+ * Portions Copyright 2001-2003 Pierangelo Masarati.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
-/*
- * Copyright 2001, Pierangelo Masarati, All rights reserved. <ando@sys-net.it>
- * 
- * This work has beed deveolped for the OpenLDAP Foundation 
- * in the hope that it may be useful to the Open Source community, 
- * but WITHOUT ANY WARRANTY.
- * 
- * Permission is granted to anyone to use this software for any purpose
- * on any computer system, and to alter it and redistribute it, subject
- * to the following restrictions:
- * 
- * 1. The author and SysNet s.n.c. are not responsible for the consequences
- *    of use of this software, no matter how awful, even if they arise from
- *    flaws in it.
- * 
- * 2. The origin of this software must not be misrepresented, either by
- *    explicit claim or by omission.  Since few users ever read sources,
- *    credits should appear in the documentation.
- * 
- * 3. Altered versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.  Since few users
- *    ever read sources, credits should appear in the documentation.
- *    SysNet s.n.c. cannot be responsible for the consequences of the
- *    alterations.
- * 
- * 4. This notice may not be removed or altered.
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by Pierangelo Masarati for inclusion
+ * in OpenLDAP Software.
  */
 
 #include "portable.h"
 #include <stdio.h>
 #include <ac/string.h>
 
+#include <lutil.h>
 #include "slap.h"
+#include "config.h"
 #include "lber_pvt.h"
 #include "back-monitor.h"
 
+#undef INTEGRATE_CORE_SCHEMA
+
 /*
  * used by many functions to add description to entries
+ *
+ * WARNING: be_monitor may change as new databases are added,
+ * so it should not be used outside monitor_back_db_init()
+ * until monitor_back_db_open is called.
  */
-AttributeDescription *monitor_ad_desc = NULL;
-BackendDB *be_monitor = NULL;
+BackendDB                      *be_monitor;
+
+static struct monitor_subsys_t **monitor_subsys;
+static int                     monitor_subsys_opened;
+static monitor_info_t          monitor_info;
 
 /*
  * subsystem data
+ *
+ * the known subsystems are added to the subsystems
+ * array at backend initialization; other subsystems
+ * may be added by calling monitor_back_register_subsys()
+ * before the database is opened (e.g. by other backends
+ * or by overlays or modules).
  */
-struct monitorsubsys monitor_subsys[] = {
+static struct monitor_subsys_t known_monitor_subsys[] = {
        { 
-               SLAPD_MONITOR_LISTENER, SLAPD_MONITOR_LISTENER_NAME,    
+               SLAPD_MONITOR_BACKEND_NAME, 
                BER_BVNULL, BER_BVNULL, BER_BVNULL,
+               { BER_BVC( "This subsystem contains information about available backends." ),
+                       BER_BVNULL },
                MONITOR_F_PERSISTENT_CH,
-               monitor_subsys_listener_init,
-               NULL,   /* update */
-               NULL,   /* create */
+               monitor_subsys_backend_init,
+               NULL,   /* destroy */
+               NULL,   /* update */
+               NULL,   /* create */
                NULL    /* modify */
                }, { 
-               SLAPD_MONITOR_DATABASE, SLAPD_MONITOR_DATABASE_NAME,    
+               SLAPD_MONITOR_CONN_NAME,
                BER_BVNULL, BER_BVNULL, BER_BVNULL,
-               MONITOR_F_PERSISTENT_CH,
-               monitor_subsys_database_init,
+               { BER_BVC( "This subsystem contains information about connections." ),
+                       BER_BVNULL },
+               MONITOR_F_VOLATILE_CH,
+               monitor_subsys_conn_init,
+               NULL,   /* destroy */
                NULL,   /* update */
                NULL,   /* create */
                NULL    /* modify */
                }, { 
-               SLAPD_MONITOR_BACKEND, SLAPD_MONITOR_BACKEND_NAME, 
+               SLAPD_MONITOR_DATABASE_NAME,    
                BER_BVNULL, BER_BVNULL, BER_BVNULL,
+               { BER_BVC( "This subsystem contains information about configured databases." ),
+                       BER_BVNULL },
                MONITOR_F_PERSISTENT_CH,
-               monitor_subsys_backend_init,
+               monitor_subsys_database_init,
+               NULL,   /* destroy */
                NULL,   /* update */
                NULL,   /* create */
                NULL    /* modify */
                }, { 
-               SLAPD_MONITOR_THREAD, SLAPD_MONITOR_THREAD_NAME,        
+               SLAPD_MONITOR_LISTENER_NAME,    
                BER_BVNULL, BER_BVNULL, BER_BVNULL,
-               MONITOR_F_NONE,
-               monitor_subsys_thread_init,
-               monitor_subsys_thread_update,
-               NULL,   /* create */
+               { BER_BVC( "This subsystem contains information about active listeners." ),
+                       BER_BVNULL },
+               MONITOR_F_PERSISTENT_CH,
+               monitor_subsys_listener_init,
+               NULL,   /* destroy */
+               NULL,   /* update */
+               NULL,   /* create */
                NULL    /* modify */
                }, { 
-               SLAPD_MONITOR_SASL, SLAPD_MONITOR_SASL_NAME,    
+               SLAPD_MONITOR_LOG_NAME,
                BER_BVNULL, BER_BVNULL, BER_BVNULL,
+               { BER_BVC( "This subsystem contains information about logging." ),
+                       BER_BVC( "Set the attribute \"managedInfo\" to the desired log levels." ),
+                       BER_BVNULL },
                MONITOR_F_NONE,
-               NULL,   /* init */
-               NULL,   /* update */
+               monitor_subsys_log_init,
+               NULL,   /* destroy */
+               NULL,   /* update */
                NULL,   /* create */
-               NULL    /* modify */
+               NULL,   /* modify */
                }, { 
-               SLAPD_MONITOR_TLS, SLAPD_MONITOR_TLS_NAME,
+               SLAPD_MONITOR_OPS_NAME,
                BER_BVNULL, BER_BVNULL, BER_BVNULL,
-               MONITOR_F_NONE,
-               NULL,   /* init */
-               NULL,   /* update */
+               { BER_BVC( "This subsystem contains information about performed operations." ),
+                       BER_BVNULL },
+               MONITOR_F_PERSISTENT_CH,
+               monitor_subsys_ops_init,
+               NULL,   /* destroy */
+               NULL,   /* update */
                NULL,   /* create */
-               NULL    /* modify */
-               }, { 
-               SLAPD_MONITOR_CONN, SLAPD_MONITOR_CONN_NAME,
-               BER_BVNULL, BER_BVNULL, BER_BVNULL,
-               MONITOR_F_VOLATILE_CH,
-               monitor_subsys_conn_init,
-               monitor_subsys_conn_update,
-               monitor_subsys_conn_create,
-               NULL    /* modify */
+               NULL,   /* modify */
                }, { 
-               SLAPD_MONITOR_READW, SLAPD_MONITOR_READW_NAME,
+               SLAPD_MONITOR_OVERLAY_NAME,
                BER_BVNULL, BER_BVNULL, BER_BVNULL,
-               MONITOR_F_NONE,
-               NULL,   /* init */
-               monitor_subsys_readw_update,
-               NULL,   /* create */
-               NULL    /* modify */
-               }, { 
-               SLAPD_MONITOR_WRITEW, SLAPD_MONITOR_WRITEW_NAME,
+               { BER_BVC( "This subsystem contains information about available overlays." ),
+                       BER_BVNULL },
+               MONITOR_F_PERSISTENT_CH,
+               monitor_subsys_overlay_init,
+               NULL,   /* destroy */
+               NULL,   /* update */
+               NULL,   /* create */
+               NULL,   /* modify */
+       }, { 
+               SLAPD_MONITOR_SASL_NAME,        
                BER_BVNULL, BER_BVNULL, BER_BVNULL,
+               { BER_BVC( "This subsystem contains information about SASL." ),
+                       BER_BVNULL },
                MONITOR_F_NONE,
                NULL,   /* init */
-               monitor_subsys_writew_update,
+               NULL,   /* destroy */
+               NULL,   /* update */
                NULL,   /* create */
                NULL    /* modify */
                }, { 
-               SLAPD_MONITOR_LOG, SLAPD_MONITOR_LOG_NAME,
-               BER_BVNULL, BER_BVNULL, BER_BVNULL,
-               MONITOR_F_NONE,
-               monitor_subsys_log_init,
-               NULL,   /* update */
-               NULL,   /* create */
-               monitor_subsys_log_modify
-               }, { 
-               SLAPD_MONITOR_OPS, SLAPD_MONITOR_OPS_NAME,
+               SLAPD_MONITOR_SENT_NAME,
                BER_BVNULL, BER_BVNULL, BER_BVNULL,
+               { BER_BVC( "This subsystem contains statistics." ),
+                       BER_BVNULL },
                MONITOR_F_PERSISTENT_CH,
-               monitor_subsys_ops_init,
-               monitor_subsys_ops_update,
+               monitor_subsys_sent_init,
+               NULL,   /* destroy */
+               NULL,   /* update */
                NULL,   /* create */
                NULL,   /* modify */
                }, { 
-               SLAPD_MONITOR_SENT, SLAPD_MONITOR_SENT_NAME,
+               SLAPD_MONITOR_THREAD_NAME,      
                BER_BVNULL, BER_BVNULL, BER_BVNULL,
+               { BER_BVC( "This subsystem contains information about threads." ),
+                       BER_BVNULL },
                MONITOR_F_PERSISTENT_CH,
-               monitor_subsys_sent_init,
-               monitor_subsys_sent_update,
+               monitor_subsys_thread_init,
+               NULL,   /* destroy */
+               NULL,   /* update */
                NULL,   /* create */
-               NULL,   /* modify */
+               NULL    /* modify */
                }, { 
-               SLAPD_MONITOR_TIME, SLAPD_MONITOR_TIME_NAME,
+               SLAPD_MONITOR_TIME_NAME,
                BER_BVNULL, BER_BVNULL, BER_BVNULL,
+               { BER_BVC( "This subsystem contains information about time." ),
+                       BER_BVNULL },
                MONITOR_F_PERSISTENT_CH,
                monitor_subsys_time_init,
-               monitor_subsys_time_update,
+               NULL,   /* destroy */
+               NULL,   /* update */
                NULL,   /* create */
                NULL,   /* modify */
-       }, { -1, NULL }
+               }, { 
+               SLAPD_MONITOR_TLS_NAME,
+               BER_BVNULL, BER_BVNULL, BER_BVNULL,
+               { BER_BVC( "This subsystem contains information about TLS." ),
+                       BER_BVNULL },
+               MONITOR_F_NONE,
+               NULL,   /* init */
+               NULL,   /* destroy */
+               NULL,   /* update */
+               NULL,   /* create */
+               NULL    /* modify */
+               }, { 
+               SLAPD_MONITOR_RWW_NAME,
+               BER_BVNULL, BER_BVNULL, BER_BVNULL,
+               { BER_BVC( "This subsystem contains information about read/write waiters." ),
+                       BER_BVNULL },
+               MONITOR_F_PERSISTENT_CH,
+               monitor_subsys_rww_init,
+               NULL,   /* destroy */
+               NULL,   /* update */
+               NULL,   /* create */
+               NULL    /* modify */
+               }, { NULL }
+};
+
+int
+monitor_back_register_subsys(
+       monitor_subsys_t        *ms )
+{
+       int     i = 0;
+
+       if ( monitor_subsys ) {
+               for ( ; monitor_subsys[ i ] != NULL; i++ )
+                       /* just count'em */ ;
+       }
+
+       monitor_subsys = ch_realloc( monitor_subsys,
+                       ( 2 + i ) * sizeof( monitor_subsys_t * ) );
+
+       if ( monitor_subsys == NULL ) {
+               return -1;
+       }
+
+       monitor_subsys[ i ] = ms;
+       monitor_subsys[ i + 1 ] = NULL;
+
+       /* if a subsystem is registered __AFTER__ subsystem 
+        * initialization (depending on the sequence the databases
+        * are listed in slapd.conf), init it */
+       if ( monitor_subsys_opened ) {
+
+               /* FIXME: this should only be possible
+                * if be_monitor is already initialized */
+               assert( be_monitor != NULL );
+
+               if ( ms->mss_open && ( *ms->mss_open )( be_monitor, ms ) ) {
+                       return -1;
+               }
+
+               ms->mss_flags |= MONITOR_F_OPENED;
+       }
+
+       return 0;
+}
+
+enum {
+       LIMBO_ENTRY,
+       LIMBO_ENTRY_PARENT,
+       LIMBO_ATTRS,
+       LIMBO_CB
 };
 
-#ifdef SLAPD_MONITOR_DYNAMIC
+typedef struct entry_limbo_t {
+       int                     el_type;
+       Entry                   *el_e;
+       Attribute               *el_a;
+       struct berval           el_ndn;
+       struct berval           el_base;
+       int                     el_scope;
+       struct berval           el_filter;
+       monitor_callback_t      *el_cb;
+       struct entry_limbo_t    *el_next;
+} entry_limbo_t;
 
 int
-back_monitor_LTX_init_module( int argc, char *argv[] )
+monitor_back_register_entry(
+       Entry                   *e,
+       monitor_callback_t      *cb )
 {
-       BackendInfo bi;
+       monitor_info_t  *mi = ( monitor_info_t * )be_monitor->be_private;
+
+       assert( mi != NULL );
+       assert( e != NULL );
+       assert( e->e_private == NULL );
+       
+       if ( monitor_subsys_opened ) {
+               Entry           *e_parent = NULL,
+                               *e_new = NULL,
+                               **ep = NULL;
+               struct berval   pdn = BER_BVNULL;
+               monitor_entry_t *mp = NULL,
+                               *mp_parent = NULL;
+               int             rc = 0;
+
+               if ( monitor_cache_get( mi, &e->e_nname, &e_parent ) == 0 ) {
+                       /* entry exists */
+                       Debug( LDAP_DEBUG_ANY,
+                               "monitor_back_register_entry(\"%s\"): "
+                               "entry exists\n",
+                               e->e_name.bv_val, 0, 0 );
+                       monitor_cache_release( mi, e_parent );
+                       return -1;
+               }
+
+               dnParent( &e->e_nname, &pdn );
+               if ( monitor_cache_get( mi, &pdn, &e_parent ) != 0 ) {
+                       /* parent does not exist */
+                       Debug( LDAP_DEBUG_ANY,
+                               "monitor_back_register_entry(\"%s\"): "
+                               "parent \"%s\" not found\n",
+                               e->e_name.bv_val, pdn.bv_val, 0 );
+                       return -1;
+               }
+
+               assert( e_parent->e_private != NULL );
+               mp_parent = ( monitor_entry_t * )e_parent->e_private;
+
+               if ( mp_parent->mp_flags & MONITOR_F_VOLATILE ) {
+                       /* entry is volatile; cannot append children */
+                       Debug( LDAP_DEBUG_ANY,
+                               "monitor_back_register_entry(\"%s\"): "
+                               "parent \"%s\" is volatile\n",
+                               e->e_name.bv_val, e_parent->e_name.bv_val, 0 );
+                       rc = -1;
+                       goto done;
+               }
+
+               mp = monitor_entrypriv_create();
+               if ( mp == NULL ) {
+                       Debug( LDAP_DEBUG_ANY,
+                               "monitor_back_register_entry(\"%s\"): "
+                               "monitor_entrypriv_create() failed\n",
+                               e->e_name.bv_val, 0, 0 );
+                       rc = -1;
+                       goto done;
+               }
+
+               e_new = entry_dup( e );
+               if ( e_new == NULL ) {
+                       Debug( LDAP_DEBUG_ANY,
+                               "monitor_back_register_entry(\"%s\"): "
+                               "entry_dup() failed\n",
+                               e->e_name.bv_val, 0, 0 );
+                       rc = -1;
+                       goto done;
+               }
+               
+               e_new->e_private = ( void * )mp;
+               mp->mp_info = mp_parent->mp_info;
+               mp->mp_flags = mp_parent->mp_flags | MONITOR_F_SUB;
+               mp->mp_cb = cb;
+
+               ep = &mp_parent->mp_children;
+               for ( ; *ep; ) {
+                       mp_parent = ( monitor_entry_t * )(*ep)->e_private;
+                       ep = &mp_parent->mp_next;
+               }
+               *ep = e_new;
+
+               if ( monitor_cache_add( mi, e_new ) ) {
+                       Debug( LDAP_DEBUG_ANY,
+                               "monitor_back_register_entry(\"%s\"): "
+                               "unable to add entry\n",
+                               e->e_name.bv_val, 0, 0 );
+                       rc = -1;
+                       goto done;
+               }
+
+done:;
+               if ( rc ) {
+                       if ( mp ) {
+                               ch_free( mp );
+                       }
+                       if ( e_new ) {
+                               e_new->e_private = NULL;
+                               entry_free( e_new );
+                       }
+               }
+
+               if ( e_parent ) {
+                       monitor_cache_release( mi, e_parent );
+               }
+
+       } else {
+               entry_limbo_t   **elpp, el = { 0 };
+
+               el.el_type = LIMBO_ENTRY;
+
+               el.el_e = entry_dup( e );
+               if ( el.el_e == NULL ) {
+                       Debug( LDAP_DEBUG_ANY,
+                               "monitor_back_register_entry(\"%s\"): "
+                               "entry_dup() failed\n",
+                               e->e_name.bv_val, 0, 0 );
+                       return -1;
+               }
+               
+               el.el_cb = cb;
+
+               for ( elpp = (entry_limbo_t **)&mi->mi_entry_limbo;
+                               *elpp;
+                               elpp = &(*elpp)->el_next )
+                       /* go to last */;
+
+               *elpp = (entry_limbo_t *)ch_malloc( sizeof( entry_limbo_t ) );
+               if ( *elpp == NULL ) {
+                       el.el_e->e_private = NULL;
+                       entry_free( el.el_e );
+                       return -1;
+               }
+
+               el.el_next = NULL;
+               **elpp = el;
+       }
 
-       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_register_entry_parent(
+       Entry                   *e,
+       monitor_callback_t      *cb,
+       struct berval           *base,
+       int                     scope,
+       struct berval           *filter )
+{
+       monitor_info_t  *mi = ( monitor_info_t * )be_monitor->be_private;
+       struct berval   ndn = BER_BVNULL;
+
+       assert( mi != NULL );
+       assert( e != NULL );
+       assert( e->e_private == NULL );
+
+       if ( BER_BVISNULL( filter ) ) {
+               /* need a filter */
+               Debug( LDAP_DEBUG_ANY,
+                       "monitor_back_register_entry_parent(\"\"): "
+                       "need a valid filter\n",
+                       0, 0, 0 );
+               return -1;
+       }
+
+       if ( monitor_subsys_opened ) {
+               Entry           *e_parent = NULL,
+                               *e_new = NULL,
+                               **ep = NULL;
+               struct berval   e_name = BER_BVNULL,
+                               e_nname = BER_BVNULL;
+               monitor_entry_t *mp = NULL,
+                               *mp_parent = NULL;
+               int             rc = 0;
+
+               if ( monitor_filter2ndn( base, scope, filter, &ndn ) ) {
+                       /* entry does not exist */
+                       Debug( LDAP_DEBUG_ANY,
+                               "monitor_back_register_entry_parent(\"\"): "
+                               "base=%s scope=%d filter=%s : "
+                               "unable to find entry\n",
+                               base->bv_val ? base->bv_val : "\"\"",
+                               scope, filter->bv_val );
+                       return -1;
+               }
+
+               if ( monitor_cache_get( mi, &ndn, &e_parent ) != 0 ) {
+                       /* entry does not exist */
+                       Debug( LDAP_DEBUG_ANY,
+                               "monitor_back_register_entry_parent(\"%s\"): "
+                               "parent entry does not exist\n",
+                               ndn.bv_val, 0, 0 );
+                       rc = -1;
+                       goto done;
+               }
+
+               assert( e_parent->e_private != NULL );
+               mp_parent = ( monitor_entry_t * )e_parent->e_private;
+
+               if ( mp_parent->mp_flags & MONITOR_F_VOLATILE ) {
+                       /* entry is volatile; cannot append callback */
+                       Debug( LDAP_DEBUG_ANY,
+                               "monitor_back_register_entry_parent(\"%s\"): "
+                               "entry is volatile\n",
+                               e_parent->e_name.bv_val, 0, 0 );
+                       rc = -1;
+                       goto done;
+               }
+
+               build_new_dn( &e_name, &e_parent->e_name, &e->e_name, NULL );
+               build_new_dn( &e_nname, &e_parent->e_nname, &e->e_nname, NULL );
+
+               if ( monitor_cache_get( mi, &e_nname, &e_new ) == 0 ) {
+                       /* entry already exists */
+                       Debug( LDAP_DEBUG_ANY,
+                               "monitor_back_register_entry_parent(\"%s\"): "
+                               "entry already exists\n",
+                               e_name.bv_val, 0, 0 );
+                       monitor_cache_release( mi, e_new );
+                       rc = -1;
+                       goto done;
+               }
+
+               mp = monitor_entrypriv_create();
+               if ( mp == NULL ) {
+                       Debug( LDAP_DEBUG_ANY,
+                               "monitor_back_register_entry_parent(\"%s\"): "
+                               "monitor_entrypriv_create() failed\n",
+                               e->e_name.bv_val, 0, 0 );
+                       rc = -1;
+                       goto done;
+               }
+
+               e_new = entry_dup( e );
+               if ( e_new == NULL ) {
+                       Debug( LDAP_DEBUG_ANY,
+                               "monitor_back_register_entry(\"%s\"): "
+                               "entry_dup() failed\n",
+                               e->e_name.bv_val, 0, 0 );
+                       rc = -1;
+                       goto done;
+               }
+               ch_free( e_new->e_name.bv_val );
+               ch_free( e_new->e_nname.bv_val );
+               e_new->e_name = e_name;
+               e_new->e_nname = e_nname;
+               
+               e_new->e_private = ( void * )mp;
+               mp->mp_info = mp_parent->mp_info;
+               mp->mp_flags = mp_parent->mp_flags | MONITOR_F_SUB;
+               mp->mp_cb = cb;
+
+               ep = &mp_parent->mp_children;
+               for ( ; *ep; ) {
+                       mp_parent = ( monitor_entry_t * )(*ep)->e_private;
+                       ep = &mp_parent->mp_next;
+               }
+               *ep = e_new;
+
+               if ( monitor_cache_add( mi, e_new ) ) {
+                       Debug( LDAP_DEBUG_ANY,
+                               "monitor_back_register_entry(\"%s\"): "
+                               "unable to add entry\n",
+                               e->e_name.bv_val, 0, 0 );
+                       rc = -1;
+                       goto done;
+               }
+
+done:;
+               if ( !BER_BVISNULL( &ndn ) ) {
+                       ch_free( ndn.bv_val );
+               }
+
+               if ( rc ) {
+                       if ( mp ) {
+                               ch_free( mp );
+                       }
+                       if ( e_new ) {
+                               e_new->e_private = NULL;
+                               entry_free( e_new );
+                       }
+               }
+
+               if ( e_parent ) {
+                       monitor_cache_release( mi, e_parent );
+               }
+
+       } else {
+               entry_limbo_t   **elpp, el = { 0 };
+
+               el.el_type = LIMBO_ENTRY_PARENT;
+
+               el.el_e = entry_dup( e );
+               if ( el.el_e == NULL ) {
+                       Debug( LDAP_DEBUG_ANY,
+                               "monitor_back_register_entry(\"%s\"): "
+                               "entry_dup() failed\n",
+                               e->e_name.bv_val, 0, 0 );
+                       return -1;
+               }
+               
+               if ( !BER_BVISNULL( base ) ) {
+                       ber_dupbv( &el.el_base, base );
+               }
+               el.el_scope = scope;
+               if ( !BER_BVISNULL( filter ) ) {
+                       ber_dupbv( &el.el_filter, filter );
+               }
+
+               el.el_cb = cb;
+
+               for ( elpp = (entry_limbo_t **)&mi->mi_entry_limbo;
+                               *elpp;
+                               elpp = &(*elpp)->el_next )
+                       /* go to last */;
+
+               *elpp = (entry_limbo_t *)ch_malloc( sizeof( entry_limbo_t ) );
+               if ( *elpp == NULL ) {
+                       el.el_e->e_private = NULL;
+                       entry_free( el.el_e );
+                       return -1;
+               }
+
+               el.el_next = NULL;
+               **elpp = el;
+       }
+
+       return 0;
+}
+
+static int
+monitor_filter2ndn_cb( Operation *op, SlapReply *rs )
+{
+       if ( rs->sr_type == REP_SEARCH ) {
+               struct berval   *ndn = op->o_callback->sc_private;
+               
+               ber_dupbv( ndn, &rs->sr_entry->e_nname );
+       }
+
+       return 0;
+}
+
+int
+monitor_filter2ndn(
+       struct berval   *base,
+       int             scope,
+       struct berval   *filter,
+       struct berval   *ndn )
+{
+       Connection      conn = { 0 };
+       char            opbuf[OPERATION_BUFFER_SIZE];
+       Operation       *op;
+       SlapReply       rs = { 0 };
+       slap_callback   cb = { NULL, monitor_filter2ndn_cb, NULL, NULL };
+       int             rc;
+
+       BER_BVZERO( ndn );
+
+       if ( be_monitor == NULL ) {
+               return -1;
+       }
+
+       op = (Operation *)opbuf;
+       connection_fake_init( &conn, op, &conn );
+
+       op->o_tag = LDAP_REQ_SEARCH;
+
+       /* use global malloc for now */
+       if ( op->o_tmpmemctx ) {
+               /* FIXME: connection_fake_init() calls slap_sl_mem_create, so we destroy it for now */
+               slap_sl_mem_destroy( NULL, op->o_tmpmemctx );
+               op->o_tmpmemctx = NULL;
+       }
+       op->o_tmpmfuncs = &ch_mfuncs;
+
+       op->o_bd = be_monitor;
+       if ( base == NULL || BER_BVISNULL( base ) ) {
+               ber_dupbv_x( &op->o_req_dn, &op->o_bd->be_suffix[ 0 ],
+                               op->o_tmpmemctx );
+               ber_dupbv_x( &op->o_req_ndn, &op->o_bd->be_nsuffix[ 0 ],
+                               op->o_tmpmemctx );
+
+       } else {
+               if ( dnPrettyNormal( NULL, base, &op->o_req_dn, &op->o_req_ndn,
+                                       op->o_tmpmemctx ) ) {
+                       return -1;
+               }
+       }
+
+       op->o_callback = &cb;
+       cb.sc_private = (void *)ndn;
+
+       op->ors_scope = scope;
+       ber_dupbv_x( &op->ors_filterstr, filter, op->o_tmpmemctx );
+       op->ors_filter = str2filter_x( op, filter->bv_val );
+       op->ors_attrs = slap_anlist_no_attrs;
+       op->ors_attrsonly = 0;
+       op->ors_tlimit = SLAP_NO_LIMIT;
+       op->ors_slimit = 1;
+       op->ors_limit = NULL;
+       op->ors_deref = LDAP_DEREF_NEVER;
+
+       op->o_nocaching = 1;
+       op->o_managedsait = SLAP_CONTROL_NONCRITICAL;
+
+       op->o_dn = be_monitor->be_rootdn;
+       op->o_ndn = be_monitor->be_rootndn;
+
+       rc = op->o_bd->be_search( op, &rs );
+
+       filter_free_x( op, op->ors_filter );
+       op->o_tmpfree( op->ors_filterstr.bv_val, op->o_tmpmemctx );
+       op->o_tmpfree( op->o_req_dn.bv_val, op->o_tmpmemctx );
+       op->o_tmpfree( op->o_req_ndn.bv_val, op->o_tmpmemctx );
+
+       if ( rc != 0 ) {
+               return rc;
+       }
+
+       switch ( rs.sr_err ) {
+       case LDAP_SUCCESS:
+               if ( BER_BVISNULL( ndn ) ) {
+                       rc = -1;
+               }
+               break;
+                       
+       case LDAP_SIZELIMIT_EXCEEDED:
+       default:
+               if ( !BER_BVISNULL( ndn ) ) {
+                       ber_memfree( ndn->bv_val );
+                       BER_BVZERO( ndn );
+               }
+               rc = -1;
+               break;
+       }
+
+       return rc;
+}
+
+int
+monitor_back_register_entry_attrs(
+       struct berval           *ndn_in,
+       Attribute               *a,
+       monitor_callback_t      *cb,
+       struct berval           *base,
+       int                     scope,
+       struct berval           *filter )
+{
+       monitor_info_t  *mi = ( monitor_info_t * )be_monitor->be_private;
+       struct berval   ndn = BER_BVNULL;
+
+       assert( mi != NULL );
+
+       if ( ndn_in != NULL ) {
+               ndn = *ndn_in;
+       }
+
+       if ( a == NULL && cb == NULL ) {
+               /* nothing to do */
+               return -1;
+       }
+
+       if ( ( ndn_in == NULL || BER_BVISNULL( &ndn ) )
+                       && BER_BVISNULL( filter ) )
+       {
+               /* need a filter */
+               Debug( LDAP_DEBUG_ANY,
+                       "monitor_back_register_entry_*(\"\"): "
+                       "need a valid filter\n",
+                       0, 0, 0 );
+               return -1;
+       }
+
+       if ( monitor_subsys_opened ) {
+               Entry                   *e = NULL;
+               Attribute               **atp = NULL;
+               monitor_entry_t         *mp = NULL;
+               monitor_callback_t      **mcp = NULL;
+               int                     rc = 0;
+               int                     freeit = 0;
+
+               if ( BER_BVISNULL( &ndn ) ) {
+                       if ( monitor_filter2ndn( base, scope, filter, &ndn ) ) {
+                               /* entry does not exist */
+                               Debug( LDAP_DEBUG_ANY,
+                                       "monitor_back_register_entry_*(\"\"): "
+                                       "base=%s scope=%d filter=%s : "
+                                       "unable to find entry\n",
+                                       base->bv_val ? base->bv_val : "\"\"",
+                                       scope, filter->bv_val );
+                               return -1;
+                       }
+
+                       freeit = 1;
+               }
+
+               if ( monitor_cache_get( mi, &ndn, &e ) != 0 ) {
+                       /* entry does not exist */
+                       Debug( LDAP_DEBUG_ANY,
+                               "monitor_back_register_entry_*(\"%s\"): "
+                               "entry does not exist\n",
+                               ndn.bv_val, 0, 0 );
+                       rc = -1;
+                       goto done;
+               }
+
+               assert( e->e_private != NULL );
+               mp = ( monitor_entry_t * )e->e_private;
+
+               if ( mp->mp_flags & MONITOR_F_VOLATILE ) {
+                       /* entry is volatile; cannot append callback */
+                       Debug( LDAP_DEBUG_ANY,
+                               "monitor_back_register_entry_*(\"%s\"): "
+                               "entry is volatile\n",
+                               e->e_name.bv_val, 0, 0 );
+                       rc = -1;
+                       goto done;
+               }
+
+               if ( a ) {
+                       for ( atp = &e->e_attrs; *atp; atp = &(*atp)->a_next )
+                               /* just get to last */ ;
+
+                       *atp = attrs_dup( a );
+                       if ( *atp == NULL ) {
+                               Debug( LDAP_DEBUG_ANY,
+                                       "monitor_back_register_entry_*(\"%s\"): "
+                                       "attrs_dup() failed\n",
+                                       e->e_name.bv_val, 0, 0 );
+                               rc = -1;
+                               goto done;
+                       }
+               }
+
+               if ( cb ) {
+                       for ( mcp = &mp->mp_cb; *mcp; mcp = &(*mcp)->mc_next )
+                               /* go to tail */ ;
+               
+                       /* NOTE: we do not clear cb->mc_next, so this function
+                        * can be used to append a list of callbacks */
+                       (*mcp) = cb;
+               }
+
+done:;
+               if ( rc ) {
+                       if ( *atp ) {
+                               attrs_free( *atp );
+                               *atp = NULL;
+                       }
+               }
+
+               if ( freeit ) {
+                       ber_memfree( ndn.bv_val );
+               }
+
+               if ( e ) {
+                       monitor_cache_release( mi, e );
+               }
+
+       } else {
+               entry_limbo_t   **elpp, el = { 0 };
+
+               el.el_type = LIMBO_ATTRS;
+               if ( !BER_BVISNULL( &ndn ) ) {
+                       ber_dupbv( &el.el_ndn, &ndn );
+               }
+               if ( !BER_BVISNULL( base ) ) {
+                       ber_dupbv( &el.el_base, base);
+               }
+               el.el_scope = scope;
+               if ( !BER_BVISNULL( filter ) ) {
+                       ber_dupbv( &el.el_filter, filter );
+               }
+
+               el.el_a = attrs_dup( a );
+               el.el_cb = cb;
+
+               for ( elpp = (entry_limbo_t **)&mi->mi_entry_limbo;
+                               *elpp;
+                               elpp = &(*elpp)->el_next )
+                       /* go to last */;
+
+               *elpp = (entry_limbo_t *)ch_malloc( sizeof( entry_limbo_t ) );
+               if ( *elpp == NULL ) {
+                       el.el_e->e_private = NULL;
+                       entry_free( el.el_e );
+                       return -1;
+               }
+
+               el.el_next = NULL;
+               **elpp = el;
+       }
+
+       return 0;
+}
+
+int
+monitor_back_register_entry_callback(
+       struct berval           *ndn,
+       monitor_callback_t      *cb,
+       struct berval           *base,
+       int                     scope,
+       struct berval           *filter )
+{
+       return monitor_back_register_entry_attrs( ndn, NULL, cb,
+                       base, scope, filter );
+}
+
+monitor_subsys_t *
+monitor_back_get_subsys( const char *name )
+{
+       if ( monitor_subsys != NULL ) {
+               int     i;
+               
+               for ( i = 0; monitor_subsys[ i ] != NULL; i++ ) {
+                       if ( strcasecmp( monitor_subsys[ i ]->mss_name, name ) == 0 ) {
+                               return monitor_subsys[ i ];
+                       }
+               }
+       }
+
+       return NULL;
+}
+
+monitor_subsys_t *
+monitor_back_get_subsys_by_dn(
+       struct berval   *ndn,
+       int             sub )
+{
+       if ( monitor_subsys != NULL ) {
+               int     i;
+
+               if ( sub ) {
+                       for ( i = 0; monitor_subsys[ i ] != NULL; i++ ) {
+                               if ( dnIsSuffix( ndn, &monitor_subsys[ i ]->mss_ndn ) ) {
+                                       return monitor_subsys[ i ];
+                               }
+                       }
+
+               } else {
+                       for ( i = 0; monitor_subsys[ i ] != NULL; i++ ) {
+                               if ( dn_match( ndn, &monitor_subsys[ i ]->mss_ndn ) ) {
+                                       return monitor_subsys[ i ];
+                               }
+                       }
+               }
+       }
+
+       return NULL;
+}
 
 int
 monitor_back_initialize(
-       BackendInfo     *bi
-)
+       BackendInfo     *bi )
 {
-       static char *controls[] = {
+       monitor_subsys_t        *ms;
+       static char             *controls[] = {
                LDAP_CONTROL_MANAGEDSAIT,
-               LDAP_CONTROL_VALUESRETURNFILTER,
                NULL
        };
+       monitor_info_t          *mi = &monitor_info;
+       int                     i;
+       const char              *text;
+
+       struct m_s {
+               char    *name;
+               char    *schema;
+               slap_mask_t flags;
+               int     offset;
+       } moc[] = {
+               { "monitor", "( 1.3.6.1.4.1.4203.666.3.16.1 "
+                       "NAME 'monitor' "
+                       "DESC 'OpenLDAP system monitoring' "
+                       "SUP top STRUCTURAL "
+                       "MUST cn "
+                       "MAY ( "
+                               "description "
+                               "$ seeAlso "
+                               "$ labeledURI "
+                               "$ monitoredInfo "
+                               "$ managedInfo "
+                               "$ monitorOverlay "
+                       ") )", SLAP_OC_OPERATIONAL|SLAP_OC_HIDE,
+                       offsetof(monitor_info_t, mi_oc_monitor) },
+               { "monitorServer", "( 1.3.6.1.4.1.4203.666.3.16.2 "
+                       "NAME 'monitorServer' "
+                       "DESC 'Server monitoring root entry' "
+                       "SUP monitor STRUCTURAL )", SLAP_OC_OPERATIONAL|SLAP_OC_HIDE,
+                       offsetof(monitor_info_t, mi_oc_monitorServer) },
+               { "monitorContainer", "( 1.3.6.1.4.1.4203.666.3.16.3 "
+                       "NAME 'monitorContainer' "
+                       "DESC 'monitor container class' "
+                       "SUP monitor STRUCTURAL )", SLAP_OC_OPERATIONAL|SLAP_OC_HIDE,
+                       offsetof(monitor_info_t, mi_oc_monitorContainer) },
+               { "monitorCounterObject", "( 1.3.6.1.4.1.4203.666.3.16.4 "
+                       "NAME 'monitorCounterObject' "
+                       "DESC 'monitor counter class' "
+                       "SUP monitor STRUCTURAL )", SLAP_OC_OPERATIONAL|SLAP_OC_HIDE,
+                       offsetof(monitor_info_t, mi_oc_monitorCounterObject) },
+               { "monitorOperation", "( 1.3.6.1.4.1.4203.666.3.16.5 "
+                       "NAME 'monitorOperation' "
+                       "DESC 'monitor operation class' "
+                       "SUP monitor STRUCTURAL )", SLAP_OC_OPERATIONAL|SLAP_OC_HIDE,
+                       offsetof(monitor_info_t, mi_oc_monitorOperation) },
+               { "monitorConnection", "( 1.3.6.1.4.1.4203.666.3.16.6 "
+                       "NAME 'monitorConnection' "
+                       "DESC 'monitor connection class' "
+                       "SUP monitor STRUCTURAL )", SLAP_OC_OPERATIONAL|SLAP_OC_HIDE,
+                       offsetof(monitor_info_t, mi_oc_monitorConnection) },
+               { "managedObject", "( 1.3.6.1.4.1.4203.666.3.16.7 "
+                       "NAME 'managedObject' "
+                       "DESC 'monitor managed entity class' "
+                       "SUP monitor STRUCTURAL )", SLAP_OC_OPERATIONAL|SLAP_OC_HIDE,
+                       offsetof(monitor_info_t, mi_oc_managedObject) },
+               { "monitoredObject", "( 1.3.6.1.4.1.4203.666.3.16.8 "
+                       "NAME 'monitoredObject' "
+                       "DESC 'monitor monitored entity class' "
+                       "SUP monitor STRUCTURAL )", SLAP_OC_OPERATIONAL|SLAP_OC_HIDE,
+                       offsetof(monitor_info_t, mi_oc_monitoredObject) },
+               { NULL, NULL, 0, -1 }
+       }, mat[] = {
+               { "monitoredInfo", "( 1.3.6.1.4.1.4203.666.1.55.1 "
+                       "NAME 'monitoredInfo' "
+                       "DESC 'monitored info' "
+                       /* "SUP name " */
+                       "EQUALITY caseIgnoreMatch "
+                       "SUBSTR caseIgnoreSubstringsMatch "
+                       "SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768} "
+                       "NO-USER-MODIFICATION "
+                       "USAGE directoryOperation )", SLAP_AT_HIDE,
+                       offsetof(monitor_info_t, mi_ad_monitoredInfo) },
+               { "managedInfo", "( 1.3.6.1.4.1.4203.666.1.55.2 "
+                       "NAME 'managedInfo' "
+                       "DESC 'monitor managed info' "
+                       "SUP name )", SLAP_AT_HIDE,
+                       offsetof(monitor_info_t, mi_ad_managedInfo) },
+               { "monitorCounter", "( 1.3.6.1.4.1.4203.666.1.55.3 "
+                       "NAME 'monitorCounter' "
+                       "DESC 'monitor counter' "
+                       "EQUALITY integerMatch "
+                       "ORDERING integerOrderingMatch "
+                       "SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 "
+                       "NO-USER-MODIFICATION "
+                       "USAGE directoryOperation )", SLAP_AT_HIDE,
+                       offsetof(monitor_info_t, mi_ad_monitorCounter) },
+               { "monitorOpCompleted", "( 1.3.6.1.4.1.4203.666.1.55.4 "
+                       "NAME 'monitorOpCompleted' "
+                       "DESC 'monitor completed operations' "
+                       "SUP monitorCounter "
+                       "NO-USER-MODIFICATION "
+                       "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+                       offsetof(monitor_info_t, mi_ad_monitorOpCompleted) },
+               { "monitorOpInitiated", "( 1.3.6.1.4.1.4203.666.1.55.5 "
+                       "NAME 'monitorOpInitiated' "
+                       "DESC 'monitor initiated operations' "
+                       "SUP monitorCounter "
+                       "NO-USER-MODIFICATION "
+                       "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+                       offsetof(monitor_info_t, mi_ad_monitorOpInitiated) },
+               { "monitorConnectionNumber", "( 1.3.6.1.4.1.4203.666.1.55.6 "
+                       "NAME 'monitorConnectionNumber' "
+                       "DESC 'monitor connection number' "
+                       "SUP monitorCounter "
+                       "NO-USER-MODIFICATION "
+                       "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+                       offsetof(monitor_info_t, mi_ad_monitorConnectionNumber) },
+               { "monitorConnectionAuthzDN", "( 1.3.6.1.4.1.4203.666.1.55.7 "
+                       "NAME 'monitorConnectionAuthzDN' "
+                       "DESC 'monitor connection authorization DN' "
+                       /* "SUP distinguishedName " */
+                       "EQUALITY distinguishedNameMatch "
+                       "SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 "
+                       "NO-USER-MODIFICATION "
+                       "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+                       offsetof(monitor_info_t, mi_ad_monitorConnectionAuthzDN) },
+               { "monitorConnectionLocalAddress", "( 1.3.6.1.4.1.4203.666.1.55.8 "
+                       "NAME 'monitorConnectionLocalAddress' "
+                       "DESC 'monitor connection local address' "
+                       "SUP monitoredInfo "
+                       "NO-USER-MODIFICATION "
+                       "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+                       offsetof(monitor_info_t, mi_ad_monitorConnectionLocalAddress) },
+               { "monitorConnectionPeerAddress", "( 1.3.6.1.4.1.4203.666.1.55.9 "
+                       "NAME 'monitorConnectionPeerAddress' "
+                       "DESC 'monitor connection peer address' "
+                       "SUP monitoredInfo "
+                       "NO-USER-MODIFICATION "
+                       "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+                       offsetof(monitor_info_t, mi_ad_monitorConnectionPeerAddress) },
+               { "monitorTimestamp", "( 1.3.6.1.4.1.4203.666.1.55.10 "
+                       "NAME 'monitorTimestamp' "
+                       "DESC 'monitor timestamp' "
+                       "EQUALITY generalizedTimeMatch "
+                       "ORDERING generalizedTimeOrderingMatch "
+                       "SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 "
+                       "SINGLE-VALUE "
+                       "NO-USER-MODIFICATION "
+                       "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+                       offsetof(monitor_info_t, mi_ad_monitorTimestamp) },
+               { "monitorOverlay", "( 1.3.6.1.4.1.4203.666.1.55.11 "
+                       "NAME 'monitorOverlay' "
+                       "DESC 'name of overlays defined for a given database' "
+                       "SUP monitoredInfo "
+                       "NO-USER-MODIFICATION "
+                       "USAGE directoryOperation )", SLAP_AT_HIDE,
+                       offsetof(monitor_info_t, mi_ad_monitorOverlay) },
+               { "readOnly", "( 1.3.6.1.4.1.4203.666.1.55.12 "
+                       "NAME 'readOnly' "
+                       "DESC 'read/write status of a given database' "
+                       "EQUALITY booleanMatch "
+                       "SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 "
+                       "SINGLE-VALUE "
+                       "USAGE directoryOperation )", SLAP_AT_HIDE,
+                       offsetof(monitor_info_t, mi_ad_readOnly) },
+               { "restrictedOperation", "( 1.3.6.1.4.1.4203.666.1.55.13 "
+                       "NAME 'restrictedOperation' "
+                       "DESC 'name of restricted operation for a given database' "
+                       "SUP managedInfo )", SLAP_AT_HIDE,
+                       offsetof(monitor_info_t, mi_ad_restrictedOperation ) },
+               { "monitorConnectionProtocol", "( 1.3.6.1.4.1.4203.666.1.55.14 "
+                       "NAME 'monitorConnectionProtocol' "
+                       "DESC 'monitor connection protocol' "
+                       "SUP monitoredInfo "
+                       "NO-USER-MODIFICATION "
+                       "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+                       offsetof(monitor_info_t, mi_ad_monitorConnectionProtocol) },
+               { "monitorConnectionOpsReceived", "( 1.3.6.1.4.1.4203.666.1.55.15 "
+                       "NAME 'monitorConnectionOpsReceived' "
+                       "DESC 'monitor number of operations received by the connection' "
+                       "SUP monitorCounter "
+                       "NO-USER-MODIFICATION "
+                       "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+                       offsetof(monitor_info_t, mi_ad_monitorConnectionOpsReceived) },
+               { "monitorConnectionOpsExecuting", "( 1.3.6.1.4.1.4203.666.1.55.16 "
+                       "NAME 'monitorConnectionOpsExecuting' "
+                       "DESC 'monitor number of operations in execution within the connection' "
+                       "SUP monitorCounter "
+                       "NO-USER-MODIFICATION "
+                       "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+                       offsetof(monitor_info_t, mi_ad_monitorConnectionOpsExecuting) },
+               { "monitorConnectionOpsPending", "( 1.3.6.1.4.1.4203.666.1.55.17 "
+                       "NAME 'monitorConnectionOpsPending' "
+                       "DESC 'monitor number of pending operations within the connection' "
+                       "SUP monitorCounter "
+                       "NO-USER-MODIFICATION "
+                       "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+                       offsetof(monitor_info_t, mi_ad_monitorConnectionOpsPending) },
+               { "monitorConnectionOpsCompleted", "( 1.3.6.1.4.1.4203.666.1.55.18 "
+                       "NAME 'monitorConnectionOpsCompleted' "
+                       "DESC 'monitor number of operations completed within the connection' "
+                       "SUP monitorCounter "
+                       "NO-USER-MODIFICATION "
+                       "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+                       offsetof(monitor_info_t, mi_ad_monitorConnectionOpsCompleted) },
+               { "monitorConnectionGet", "( 1.3.6.1.4.1.4203.666.1.55.19 "
+                       "NAME 'monitorConnectionGet' "
+                       "DESC 'number of times connection_get() was called so far' "
+                       "SUP monitorCounter "
+                       "NO-USER-MODIFICATION "
+                       "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+                       offsetof(monitor_info_t, mi_ad_monitorConnectionGet) },
+               { "monitorConnectionRead", "( 1.3.6.1.4.1.4203.666.1.55.20 "
+                       "NAME 'monitorConnectionRead' "
+                       "DESC 'number of times connection_read() was called so far' "
+                       "SUP monitorCounter "
+                       "NO-USER-MODIFICATION "
+                       "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+                       offsetof(monitor_info_t, mi_ad_monitorConnectionRead) },
+               { "monitorConnectionWrite", "( 1.3.6.1.4.1.4203.666.1.55.21 "
+                       "NAME 'monitorConnectionWrite' "
+                       "DESC 'number of times connection_write() was called so far' "
+                       "SUP monitorCounter "
+                       "NO-USER-MODIFICATION "
+                       "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+                       offsetof(monitor_info_t, mi_ad_monitorConnectionWrite) },
+               { "monitorConnectionMask", "( 1.3.6.1.4.1.4203.666.1.55.22 "
+                       "NAME 'monitorConnectionMask' "
+                       "DESC 'monitor connection mask' "
+                       "SUP monitoredInfo "
+                       "NO-USER-MODIFICATION "
+                       "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+                       offsetof(monitor_info_t, mi_ad_monitorConnectionMask) },
+               { "monitorConnectionListener", "( 1.3.6.1.4.1.4203.666.1.55.23 "
+                       "NAME 'monitorConnectionListener' "
+                       "DESC 'monitor connection listener' "
+                       "SUP monitoredInfo "
+                       "NO-USER-MODIFICATION "
+                       "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+                       offsetof(monitor_info_t, mi_ad_monitorConnectionListener) },
+               { "monitorConnectionPeerDomain", "( 1.3.6.1.4.1.4203.666.1.55.24 "
+                       "NAME 'monitorConnectionPeerDomain' "
+                       "DESC 'monitor connection peer domain' "
+                       "SUP monitoredInfo "
+                       "NO-USER-MODIFICATION "
+                       "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+                       offsetof(monitor_info_t, mi_ad_monitorConnectionPeerDomain) },
+               { "monitorConnectionStartTime", "( 1.3.6.1.4.1.4203.666.1.55.25 "
+                       "NAME 'monitorConnectionStartTime' "
+                       "DESC 'monitor connection start time' "
+                       "SUP monitorTimestamp "
+                       "SINGLE-VALUE "
+                       "NO-USER-MODIFICATION "
+                       "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+                       offsetof(monitor_info_t, mi_ad_monitorConnectionStartTime) },
+               { "monitorConnectionActivityTime", "( 1.3.6.1.4.1.4203.666.1.55.26 "
+                       "NAME 'monitorConnectionActivityTime' "
+                       "DESC 'monitor connection activity time' "
+                       "SUP monitorTimestamp "
+                       "SINGLE-VALUE "
+                       "NO-USER-MODIFICATION "
+                       "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+                       offsetof(monitor_info_t, mi_ad_monitorConnectionActivityTime) },
+               { "monitorIsShadow", "( 1.3.6.1.4.1.4203.666.1.55.27 "
+                       "NAME 'monitorIsShadow' "
+                       "DESC 'TRUE if the database is shadow' "
+                       "EQUALITY booleanMatch "
+                       "SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 "
+                       "SINGLE-VALUE "
+                       "USAGE directoryOperation )", SLAP_AT_HIDE,
+                       offsetof(monitor_info_t, mi_ad_monitorIsShadow) },
+               { "monitorUpdateRef", "( 1.3.6.1.4.1.4203.666.1.55.28 "
+                       "NAME 'monitorUpdateRef' "
+                       "DESC 'update referral for shadow databases' "
+                       "SUP monitoredInfo "
+                       "SINGLE-VALUE "
+                       "USAGE directoryOperation )", SLAP_AT_HIDE,
+                       offsetof(monitor_info_t, mi_ad_monitorUpdateRef) },
+               { "monitorRuntimeConfig", "( 1.3.6.1.4.1.4203.666.1.55.29 "
+                       "NAME 'monitorRuntimeConfig' "
+                       "DESC 'TRUE if component allows runtime configuration' "
+                       "EQUALITY booleanMatch "
+                       "SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 "
+                       "SINGLE-VALUE "
+                       "USAGE directoryOperation )", SLAP_AT_HIDE,
+                       offsetof(monitor_info_t, mi_ad_monitorRuntimeConfig) },
+               { NULL, NULL, 0, -1 }
+       };
+       static ConfigTable monitorcfg[] = {
+               { NULL, NULL, 0, 0, 0, ARG_IGNORED,
+                       NULL, NULL, NULL, NULL }
+       };
+       static ConfigOCs monitorocs[] = {
+               { "( OLcfgDbOc:4.1 "
+                       "NAME 'olcMonitorConfig' "
+                       "DESC 'Monitor backend configuration' "
+                       "SUP olcDatabaseConfig "
+                       ")",
+                               Cft_Database, monitorcfg },
+               { NULL, 0, NULL }
+       };
+       int             rc;
 
        bi->bi_controls = controls;
 
@@ -225,457 +1257,474 @@ monitor_back_initialize(
        bi->bi_tool_entry_put = 0;
        bi->bi_tool_entry_reindex = 0;
        bi->bi_tool_sync = 0;
+       bi->bi_tool_dn2id_get = 0;
+       bi->bi_tool_id2entry_get = 0;
+       bi->bi_tool_entry_modify = 0;
 
        bi->bi_connection_init = 0;
        bi->bi_connection_destroy = 0;
 
-       return 0;
-}
+       /*
+        * configuration objectClasses (fake)
+        */
+       bi->bi_cf_ocs = monitorocs;
 
-int
-monitor_back_db_init(
-       BackendDB       *be
-)
-{
-       struct monitorinfo      *mi;
-       Entry                   *e, *e_tmp;
-       struct monitorentrypriv *mp;
-       int                     i, rc;
-       char                    buf[1024], *end_of_line;
-       struct berval           dn, ndn;
-       const char              *text;
-       struct berval           bv;
-       struct m_s {
-               char    *name;
-               char    *schema;
-               int     offset;
-       } moc[] = {
-               { "monitorServer", "( 1.3.6.1.4.1.4203.666.XXX "
-                       "NAME 'monitorServer' "
-                       "DESC 'Server monitoring root entry' "
-                       "SUP monitor STRUCTURAL)",
-                       offsetof(struct monitorinfo, monitor_oc_monitorServer) },
-               { "monitorContainer", "( 1.3.6.1.4.1.4203.666.XXX "
-                       "NAME 'monitorContainer' "
-                       "DESC 'monitor container class' "
-                       "SUP monitor STRUCTURAL)",
-                       offsetof(struct monitorinfo, monitor_oc_monitorContainer) },
-               { "monitorCounter", "( 1.3.6.1.4.1.4203.666.XXX "
-                       "NAME 'monitorCounter' "
-                       "DESC 'monitor counter class' "
-                       "SUP monitor STRUCTURAL)",
-                       offsetof(struct monitorinfo, monitor_oc_monitorCounter) },
-               { "monitorOperation", "( 1.3.6.1.4.1.4203.666.XXX "
-                       "NAME 'monitorOperation' "
-                       "DESC 'monitor operation class' "
-                       "SUP monitor STRUCTURAL)",
-                       offsetof(struct monitorinfo, monitor_oc_monitorOperation) },
-               { "monitorConnection", "( 1.3.6.1.4.1.4203.666.XXX "
-                       "NAME 'monitorConnection' "
-                       "DESC 'monitor connection class' "
-                       "SUP monitor STRUCTURAL)",
-                       offsetof(struct monitorinfo, monitor_oc_monitorConnection) },
-               { "managedObject", "( 1.3.6.1.4.1.4203.666.XXX "
-                       "NAME 'managedObject' "
-                       "DESC 'monitor managed entity class' "
-                       "SUP monitor STRUCTURAL)",
-                       offsetof(struct monitorinfo, monitor_oc_managedObject) },
-               { "monitoredObject", "( 1.3.6.1.4.1.4203.666.XXX "
-                       "NAME 'monitoredObject' "
-                       "DESC 'monitor monitored entity class' "
-                       "SUP monitor STRUCTURAL)",
-                       offsetof(struct monitorinfo, monitor_oc_monitoredObject) },
-               { NULL, NULL, -1 }
-       }, mat[] = {
-               { "monitoredInfo", "( 1.3.6.1.4.1.4203.666.XXX"
-                       "NAME 'monitoredInfo' "
-                       "DESC 'monitored info' "
-                       "SUP name )",
-                       offsetof(struct monitorinfo, monitor_ad_monitoredInfo) },
-               { "managedInfo", "( 1.3.6.1.4.1.4203.666.XXX"
-                       "NAME 'managedInfo' "
-                       "DESC 'monitor managed info' "
-                       "SUP name )",
-                       offsetof(struct monitorinfo, monitor_ad_managedInfo) },
-               { "monitorCounter", "( 1.3.6.1.4.1.4203.666.XXX"
-                       "NAME 'monitorCounter' "
-                       "DESC 'monitor counter' "
-                       "EQUALITY integerMatch "
-                       "SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )",
-                       offsetof(struct monitorinfo, monitor_ad_monitorCounter) },
-               { "monitorOpCompleted", "( 1.3.6.1.4.1.4203.666.XXX"
-                       "NAME 'monitorOpCompleted' "
-                       "DESC 'monitor completed operations' "
-                       "SUP monitorCounter )",
-                       offsetof(struct monitorinfo, monitor_ad_monitorOpCompleted) },
-               { "monitorOpInitiated", "( 1.3.6.1.4.1.4203.666.XXX"
-                       "NAME 'monitorOpInitiated' "
-                       "DESC 'monitor initiated operations' "
-                       "SUP monitorCounter )",
-                       offsetof(struct monitorinfo, monitor_ad_monitorOpInitiated) },
-               { "monitorConnectionNumber", "( 1.3.6.1.4.1.4203.666.XXX"
-                       "NAME 'monitorConnectionNumber' "
-                       "DESC 'monitor connection number' "
-                       "SUP monitorCounter )",
-                       offsetof(struct monitorinfo, monitor_ad_monitorConnectionNumber) },
-               { "monitorConnectionAuthzDN", "( 1.3.6.1.4.1.4203.666.XXX"
-                       "NAME 'monitorConnectionAuthzDN' "
-                       "DESC 'monitor connection authorization DN' "
-                       "SUP distinguishedName)",
-                       offsetof(struct monitorinfo, monitor_ad_monitorConnectionAuthzDN) },
-               { "monitorConnectionLocalAddress", "( 1.3.6.1.4.1.4203.666.XXX"
-                       "NAME 'monitorConnectionLocalAddress' "
-                       "DESC 'monitor connection local address' "
-                       "SUP monitoredInfo)",
-                       offsetof(struct monitorinfo, monitor_ad_monitorConnectionLocalAddress) },
-               { "monitorConnectionPeerAddress", "( 1.3.6.1.4.1.4203.666.XXX"
-                       "NAME 'monitorConnectionPeerAddress' "
-                       "DESC 'monitor connection peer address' "
-                       "SUP monitoredInfo)",
-                       offsetof(struct monitorinfo, monitor_ad_monitorConnectionPeerAddress) },
-               { NULL, NULL, -1 }
-       };
+       rc = config_register_schema( monitorcfg, monitorocs );
+       if ( rc ) {
+               return rc;
+       }
 
        /*
-        * database monitor can be defined once only
+        * register subsys
         */
-       if ( be_monitor ) {
-#ifdef NEW_LOGGING
-               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", 0, 0, 0 );
-#endif
-               return( -1 );
+       for ( ms = known_monitor_subsys; ms->mss_name != NULL; ms++ ) {
+               if ( monitor_back_register_subsys( ms ) ) {
+                       return -1;
+               }
        }
-       be_monitor = be;
 
-       /* indicate system schema supported */
-       be->be_flags |= SLAP_BFLAG_MONITOR;
+       /* schema integration */
+       for ( i = 0; mat[ i ].name; i++ ) {
+               LDAPAttributeType       *at;
+               int                     code;
+               const char              *err;
+               AttributeDescription    **ad;
 
-       dn.bv_val = SLAPD_MONITOR_DN;
-       dn.bv_len = sizeof( SLAPD_MONITOR_DN ) - 1;
+               at = ldap_str2attributetype( mat[ i ].schema, &code,
+                       &err, LDAP_SCHEMA_ALLOW_ALL );
+               if ( !at ) {
+                       Debug( LDAP_DEBUG_ANY, "monitor_back_db_init: "
+                               "in AttributeType \"%s\" %s before %s\n",
+                               mat[ i ].name, ldap_scherr2str(code), err );
+                       return -1;
+               }
 
-       rc = dnNormalize2( NULL, &dn, &ndn, NULL );
-       if( rc != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( OPERATION, CRIT,
-                       "unable to normalize monitor DN \"" SLAPD_MONITOR_DN
-                       "\"\n" , 0, 0, 0 );
-#else
-               Debug( LDAP_DEBUG_ANY,
-                       "unable to normalize monitor DN \"" SLAPD_MONITOR_DN
-                       "\"\n", 0, 0, 0 );
-#endif
-               return -1;
-       }
+               if ( at->at_oid == NULL ) {
+                       Debug( LDAP_DEBUG_ANY, "monitor_back_db_init: "
+                               "null OID for attributeType \"%s\"\n",
+                               mat[ i ].name, 0, 0 );
+                       return -1;
+               }
 
-       ber_dupbv( &bv, &dn );
-       ber_bvarray_add( &be->be_suffix, &bv );
-       ber_bvarray_add( &be->be_nsuffix, &ndn );
+               code = at_add(at, 0, NULL, &err);
+               if ( code ) {
+                       Debug( LDAP_DEBUG_ANY, "monitor_back_db_init: "
+                               "%s in attributeType \"%s\"\n",
+                               scherr2str(code), mat[ i ].name, 0 );
+                       return -1;
+               }
+               ldap_memfree(at);
 
-       mi = ( struct monitorinfo * )ch_calloc( sizeof( struct monitorinfo ), 1 );
-       if ( mi == NULL ) {
-               return -1;
-       }
+               ad = ((AttributeDescription **)&(((char *)mi)[ mat[ i ].offset ]));
+               ad[ 0 ] = NULL;
+               if ( slap_str2ad( mat[ i ].name, ad, &text ) ) {
+                       Debug( LDAP_DEBUG_ANY,
+                               "monitor_back_db_init: %s\n", text, 0, 0 );
+                       return -1;
+               }
 
-       ldap_pvt_thread_mutex_init( &mi->mi_cache_mutex );
+               (*ad)->ad_type->sat_flags |= mat[ i ].flags;
+       }
 
-       for ( i = 0; moc[i].name; i++ ) {
+       for ( i = 0; moc[ i ].name; i++ ) {
                LDAPObjectClass         *oc;
                int                     code;
                const char              *err;
                ObjectClass             *Oc;
 
-               oc = ldap_str2objectclass(moc[i].schema, &code, &err,
+               oc = ldap_str2objectclass(moc[ i ].schema, &code, &err,
                                LDAP_SCHEMA_ALLOW_ALL );
                if ( !oc ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( OPERATION, CRIT,
-                               "unable to parse monitor objectclass '%s' "
-                               "(%s before %s)\n" , moc[i].name,
-                               ldap_scherr2str(code), err );
-#else
                        Debug( LDAP_DEBUG_ANY,
-                               "unable to parse monitor objectclass '%s' "
-                               "(%s before %s)\n" , moc[i].name,
+                               "unable to parse monitor objectclass \"%s\": "
+                               "%s before %s\n" , moc[ i ].name,
                                ldap_scherr2str(code), err );
-#endif
                        return -1;
                }
 
                if ( oc->oc_oid == NULL ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( OPERATION, CRIT,
-                               "objectclass '%s' has no OID\n" ,
-                               moc[i].name, 0, 0 );
-#else
                        Debug( LDAP_DEBUG_ANY,
-                               "objectclass '%s' has no OID\n" ,
-                               moc[i].name, 0, 0 );
-#endif
+                               "objectclass \"%s\" has no OID\n" ,
+                               moc[ i ].name, 0, 0 );
                        return -1;
                }
 
-               code = oc_add(oc,1,&err);
+               code = oc_add(oc, 0, NULL, &err);
                if ( code ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( OPERATION, CRIT,
-                               "objectclass '%s' (%s before %s)\n" ,
-                               moc[i].name, scherr2str(code), err );
-#else
                        Debug( LDAP_DEBUG_ANY,
-                               "objectclass '%s' (%s before %s)\n" ,
-                               moc[i].name, scherr2str(code), err );
-#endif
+                               "objectclass \"%s\": %s \"%s\"\n" ,
+                               moc[ i ].name, scherr2str(code), err );
                        return -1;
                }
 
                ldap_memfree(oc);
 
-               Oc = oc_find( moc[i].name );
+               Oc = oc_find( moc[ i ].name );
                if ( Oc == NULL ) {
+                       Debug( LDAP_DEBUG_ANY, "monitor_back_db_init: "
+                                       "unable to find objectClass %s "
+                                       "(just added)\n", moc[ i ].name, 0, 0 );
                        return -1;
                }
 
-               ((ObjectClass **)&(((char *)mi)[moc[i].offset]))[0] = Oc;
+               Oc->soc_flags |= moc[ i ].flags;
+
+               ((ObjectClass **)&(((char *)mi)[ moc[ i ].offset ]))[ 0 ] = Oc;
        }
 
-       for ( i = 0; mat[i].name; i++ ) {
-               LDAPAttributeType *at;
-               int             code;
-               const char      *err;
-               AttributeDescription **ad;
+       return 0;
+}
 
-               at = ldap_str2attributetype( mat[i].schema, &code,
-                               &err, LDAP_SCHEMA_ALLOW_ALL );
-               if ( !at ) {
-                       return 1;
-               }
+int
+monitor_back_db_init(
+       BackendDB       *be )
+{
+       int             rc;
+       struct berval   dn, ndn;
+       struct berval   bv;
 
-               if ( at->at_oid == NULL ) {
-                       return 1;
-               }
+       /*
+        * database monitor can be defined once only
+        */
+       if ( be_monitor != NULL ) {
+               Debug( LDAP_DEBUG_ANY,
+                       "only one monitor database is allowed\n", 0, 0, 0 );
+               return( -1 );
+       }
+       be_monitor = be;
 
-               /* operational attributes should be defined internally
-               if ( at->at_usage ) {
-                       fprintf( stderr, "%s: line %d: attribute type \"%s\" is operational\n",
-                                fname, lineno, at->at_oid );
-                       return 1;
-               } */
+       /* indicate system schema supported */
+       SLAP_BFLAGS(be) |= SLAP_BFLAG_MONITOR;
 
-               code = at_add(at,&err);
-               if ( code ) {
-                       return 1;
+       dn.bv_val = SLAPD_MONITOR_DN;
+       dn.bv_len = sizeof( SLAPD_MONITOR_DN ) - 1;
+
+       rc = dnNormalize( 0, NULL, NULL, &dn, &ndn, NULL );
+       if( rc != LDAP_SUCCESS ) {
+               Debug( LDAP_DEBUG_ANY,
+                       "unable to normalize monitor DN \"%s\" (%d)\n",
+                       dn.bv_val, rc, 0 );
+               return -1;
+       }
+
+       ber_dupbv( &bv, &dn );
+       ber_bvarray_add( &be->be_suffix, &bv );
+       ber_bvarray_add( &be->be_nsuffix, &ndn );
+
+       /* NOTE: only one monitor database is allowed,
+        * so we use static storage */
+       ldap_pvt_thread_mutex_init( &monitor_info.mi_cache_mutex );
+
+       be->be_private = &monitor_info;
+
+       return 0;
+}
+
+int
+monitor_back_db_open(
+       BackendDB       *be )
+{
+       monitor_info_t          *mi = (monitor_info_t *)be->be_private;
+       struct monitor_subsys_t **ms;
+       Entry                   *e, **ep;
+       monitor_entry_t         *mp;
+       int                     i;
+       char                    buf[ BACKMONITOR_BUFSIZE ];
+       struct berval           bv;
+       struct tm               *tms;
+#ifdef HAVE_GMTIME_R
+       struct tm               tm_buf;
+#endif
+       static char             tmbuf[ LDAP_LUTIL_GENTIME_BUFSIZE ];
+
+       assert( be_monitor != NULL );
+       if ( be != be_monitor ) {
+               be_monitor = be;
+       }
+
+       /*
+        * Start
+        */
+#ifndef HAVE_GMTIME_R
+       ldap_pvt_thread_mutex_lock( &gmtime_mutex );
+#endif
+#ifdef HACK_LOCAL_TIME
+# ifdef HAVE_LOCALTIME_R
+       tms = localtime_r( &starttime, &tm_buf );
+# else
+       tms = localtime( &starttime );
+# endif /* HAVE_LOCALTIME_R */
+       lutil_localtime( tmbuf, sizeof(tmbuf), tms, -timezone );
+#else /* !HACK_LOCAL_TIME */
+# ifdef HAVE_GMTIME_R
+       tms = gmtime_r( &starttime, &tm_buf );
+# else
+       tms = gmtime( &starttime );
+# endif /* HAVE_GMTIME_R */
+       lutil_gentime( tmbuf, sizeof(tmbuf), tms );
+#endif /* !HACK_LOCAL_TIME */
+#ifndef HAVE_GMTIME_R
+       ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
+#endif
+
+       mi->mi_startTime.bv_val = tmbuf;
+       mi->mi_startTime.bv_len = strlen( tmbuf );
+
+       if ( BER_BVISEMPTY( &be->be_rootdn ) ) {
+               BER_BVSTR( &mi->mi_creatorsName, SLAPD_ANONYMOUS );
+       } else {
+               mi->mi_creatorsName = be->be_rootdn;
+       }
+
+       /*
+        * creates the "cn=Monitor" entry 
+        */
+       snprintf( buf, sizeof( buf ), 
+               "dn: %s\n"
+               "objectClass: %s\n"
+               "structuralObjectClass: %s\n"
+               "cn: Monitor\n"
+               "description: This subtree contains monitoring/managing objects.\n"
+               "description: This object contains information about this server.\n"
+               "description: Most of the information is held in operational"
+               " attributeTypes, which must be explicitly requested.\n"
+               "creatorsName: %s\n"
+               "modifiersName: %s\n"
+               "createTimestamp: %s\n"
+               "modifyTimestamp: %s\n",
+               SLAPD_MONITOR_DN,
+               mi->mi_oc_monitorServer->soc_cname.bv_val,
+               mi->mi_oc_monitorServer->soc_cname.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) {
+               Debug( LDAP_DEBUG_ANY,
+                       "unable to create \"%s\" entry\n",
+                       SLAPD_MONITOR_DN, 0, 0 );
+               return( -1 );
+       }
+
+       bv.bv_val = strchr( (char *) Versionstr, '$' );
+       if ( bv.bv_val != NULL ) {
+               char    *end;
+
+               bv.bv_val++;
+               for ( ; bv.bv_val[ 0 ] == ' '; bv.bv_val++ )
+                       ;
+
+               end = strchr( bv.bv_val, '$' );
+               if ( end != NULL ) {
+                       end--;
+
+                       for ( ; end > bv.bv_val && end[ 0 ] == ' '; end-- )
+                               ;
+
+                       end++;
+
+                       bv.bv_len = end - bv.bv_val;
+
+               } else {
+                       bv.bv_len = strlen( bv.bv_val );
                }
-               ldap_memfree(at);
 
-               ad = ((AttributeDescription **)&(((char *)mi)[mat[i].offset]));
-               ad[0] = NULL;
-               if ( slap_str2ad( mat[i].name, ad, &text ) ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( OPERATION, CRIT,
-                               "monitor_back_db_init: %s\n", text, 0, 0 );
-#else
+               if ( attr_merge_normalize_one( e, mi->mi_ad_monitoredInfo,
+                                       &bv, NULL ) ) {
                        Debug( LDAP_DEBUG_ANY,
-                               "monitor_subsys_backend_init: %s\n%s%s", 
-                               text, "", "" );
-#endif
-                       return -1;
+                               "unable to add monitoredInfo to \"%s\" entry\n",
+                               SLAPD_MONITOR_DN, 0, 0 );
+                       return( -1 );
                }
        }
 
-       if ( slap_str2ad( "description", &mi->monitor_ad_description, &text ) ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( OPERATION, CRIT,
-                       "monitor_back_db_init: %s\n", text, 0, 0 );
-#else
+       mp = monitor_entrypriv_create();
+       if ( mp == NULL ) {
+               return -1;
+       }
+       e->e_private = ( void * )mp;
+       ep = &mp->mp_children;
+
+       if ( monitor_cache_add( mi, e ) ) {
                Debug( LDAP_DEBUG_ANY,
-                       "monitor_subsys_backend_init: %s\n%s%s", 
-                       text, "", "" );
-#endif
-               return( -1 );
+                       "unable to add entry \"%s\" to cache\n",
+                       SLAPD_MONITOR_DN, 0, 0 );
+               return -1;
        }
 
        /*      
         * Create all the subsystem specific entries
         */
-       e_tmp = NULL;
-       for ( i = 0; monitor_subsys[ i ].mss_name != NULL; i++ ) {
-               int             len = strlen( monitor_subsys[ i ].mss_name );
+       for ( i = 0; monitor_subsys[ i ] != NULL; i++ ) {
+               int             len = strlen( monitor_subsys[ i ]->mss_name );
                struct berval   dn;
                int             rc;
 
                dn.bv_len = len + sizeof( "cn=" ) - 1;
                dn.bv_val = ch_calloc( sizeof( char ), dn.bv_len + 1 );
                strcpy( dn.bv_val, "cn=" );
-               strcat( dn.bv_val, monitor_subsys[ i ].mss_name );
-               rc = dnPretty2( NULL, &dn, &monitor_subsys[ i ].mss_rdn, NULL );
+               strcat( dn.bv_val, monitor_subsys[ i ]->mss_name );
+               rc = dnPretty( NULL, &dn, &monitor_subsys[ i ]->mss_rdn, NULL );
                free( dn.bv_val );
                if ( rc != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( OPERATION, CRIT,
-                               "monitor RDN \"%s\" is invalid\n", 
-                               dn.bv_val, 0, 0 );
-#else
                        Debug( LDAP_DEBUG_ANY,
                                "monitor RDN \"%s\" is invalid\n", 
                                dn.bv_val, 0, 0 );
-#endif
                        return( -1 );
                }
 
                dn.bv_len += sizeof( SLAPD_MONITOR_DN ); /* 1 for the , */
                dn.bv_val = ch_malloc( dn.bv_len + 1 );
-               strcpy( dn.bv_val , monitor_subsys[ i ].mss_rdn.bv_val );
+               strcpy( dn.bv_val , monitor_subsys[ i ]->mss_rdn.bv_val );
                strcat( dn.bv_val, "," SLAPD_MONITOR_DN );
-               rc = dnPrettyNormal( NULL, &dn, &monitor_subsys[ i ].mss_dn,
-                       &monitor_subsys[ i ].mss_ndn, NULL );
+               rc = dnPrettyNormal( NULL, &dn, &monitor_subsys[ i ]->mss_dn,
+                       &monitor_subsys[ i ]->mss_ndn, NULL );
                free( dn.bv_val );
                if ( rc != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( OPERATION, CRIT,
-                               "monitor DN \"%s\" is invalid\n", 
-                               dn.bv_val, 0, 0 );
-#else
                        Debug( LDAP_DEBUG_ANY,
                                "monitor DN \"%s\" is invalid\n", 
                                dn.bv_val, 0, 0 );
-#endif
                        return( -1 );
                }
 
                snprintf( buf, sizeof( buf ),
                                "dn: %s\n"
-                               SLAPD_MONITOR_OBJECTCLASSES 
-                               "cn: %s\n",
-                               monitor_subsys[ i ].mss_dn.bv_val,
-                               monitor_subsys[ i ].mss_name );
+                               "objectClass: %s\n"
+                               "structuralObjectClass: %s\n"
+                               "cn: %s\n"
+                               "creatorsName: %s\n"
+                               "modifiersName: %s\n"
+                               "createTimestamp: %s\n"
+                               "modifyTimestamp: %s\n",
+                               monitor_subsys[ i ]->mss_dn.bv_val,
+                               mi->mi_oc_monitorContainer->soc_cname.bv_val,
+                               mi->mi_oc_monitorContainer->soc_cname.bv_val,
+                               monitor_subsys[ i ]->mss_name,
+                               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) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( OPERATION, CRIT,
-                               "unable to create '%s' entry\n", 
-                               monitor_subsys[ i ].mss_dn.bv_val, 0, 0 );
-#else
                        Debug( LDAP_DEBUG_ANY,
-                               "unable to create '%s' entry\n", 
-                               monitor_subsys[ i ].mss_dn.bv_val, 0, 0 );
-#endif
+                               "unable to create \"%s\" entry\n", 
+                               monitor_subsys[ i ]->mss_dn.bv_val, 0, 0 );
                        return( -1 );
                }
 
-               mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
+               if ( !BER_BVISNULL( &monitor_subsys[ i ]->mss_desc[ 0 ] ) ) {
+                       attr_merge_normalize( e, slap_schema.si_ad_description,
+                                       monitor_subsys[ i ]->mss_desc, NULL );
+               }
+
+               mp = monitor_entrypriv_create();
+               if ( mp == NULL ) {
+                       return -1;
+               }
                e->e_private = ( void * )mp;
-               mp->mp_info = &monitor_subsys[ i ];
-               mp->mp_children = NULL;
-               mp->mp_next = e_tmp;
-               mp->mp_flags = monitor_subsys[ i ].mss_flags;
+               mp->mp_info = monitor_subsys[ i ];
+               mp->mp_flags = monitor_subsys[ i ]->mss_flags;
 
                if ( monitor_cache_add( mi, e ) ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( OPERATION, CRIT,
-                               "unable to add entry '%s' to cache\n",
-                               monitor_subsys[ i ].mss_dn.bv_val, 0, 0 );
-#else
                        Debug( LDAP_DEBUG_ANY,
-                               "unable to add entry '%s' to cache\n",
-                               monitor_subsys[ i ].mss_dn.bv_val, 0, 0 );
-#endif
+                               "unable to add entry \"%s\" to cache\n",
+                               monitor_subsys[ i ]->mss_dn.bv_val, 0, 0 );
                        return -1;
                }
 
-               e_tmp = e;
+               *ep = e;
+               ep = &mp->mp_next;
        }
 
+       assert( be != NULL );
+
+       be->be_private = mi;
+       
        /*
-        * creates the "cn=Monitor" entry 
+        * opens the monitor backend subsystems
         */
-       snprintf( buf, sizeof( buf ), 
-                       "dn: " SLAPD_MONITOR_DN "\n"
-                       "objectClass: top\n"
-                       "objectClass: monitor\n"
-                       "objectClass: extensibleObject\n"
-                       "structuralObjectClass: monitor\n"
-                       "cn: Monitor" );
-
-       e = str2entry( buf );
-       if ( e == NULL) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( OPERATION, CRIT,
-                       "unable to create '%s' entry\n",
-                       SLAPD_MONITOR_DN, 0, 0 );
-#else
-               Debug( LDAP_DEBUG_ANY,
-                       "unable to create '%s' entry\n%s%s",
-                       SLAPD_MONITOR_DN, "", "" );
-#endif
-               return( -1 );
-       }
-       bv.bv_val = (char *) Versionstr;
-       end_of_line = strchr( Versionstr, '\n' );
-       if ( end_of_line ) {
-               bv.bv_len = end_of_line - Versionstr;
-       } else {
-               bv.bv_len = strlen( Versionstr );
-       }
-       if ( attr_merge_normalize_one( e, monitor_ad_desc, &bv, NULL ) ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( OPERATION, CRIT,
-                       "unable to add description to '%s' entry\n",
-                       SLAPD_MONITOR_DN, 0, 0 );
-#else
-               Debug( LDAP_DEBUG_ANY,
-                       "unable to add description to '%s' entry\n%s%s",
-                       SLAPD_MONITOR_DN, "", "" );
-#endif
-               return( -1 );
+       for ( ms = monitor_subsys; ms[ 0 ] != NULL; ms++ ) {
+               if ( ms[ 0 ]->mss_open && ( *ms[ 0 ]->mss_open )( be, ms[ 0 ] ) )
+               {
+                       return( -1 );
+               }
+               ms[ 0 ]->mss_flags |= MONITOR_F_OPENED;
        }
 
-       mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
-       e->e_private = ( void * )mp;
+       monitor_subsys_opened = 1;
 
-       mp->mp_info = NULL;
-       mp->mp_children = e_tmp;
-       mp->mp_next = NULL;
+       if ( mi->mi_entry_limbo ) {
+               entry_limbo_t   *el = (entry_limbo_t *)mi->mi_entry_limbo;
 
-       if ( monitor_cache_add( mi, e ) ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( OPERATION, CRIT,
-                       "unable to add entry '%s' to cache\n",
-                       SLAPD_MONITOR_DN, 0, 0 );
-#else
-               Debug( LDAP_DEBUG_ANY,
-                       "unable to add entry '%s' to cache\n%s%s",
-                       SLAPD_MONITOR_DN, "", "" );
-#endif
-               return -1;
-       }
+               for ( ; el; ) {
+                       entry_limbo_t   *tmp;
 
-       be->be_private = mi;
-       
-       return 0;
-}
+                       switch ( el->el_type ) {
+                       case LIMBO_ENTRY:
+                               monitor_back_register_entry(
+                                               el->el_e,
+                                               el->el_cb );
+                               break;
 
-int
-monitor_back_db_open(
-       BackendDB       *be
-)
-{
-       struct monitorsubsys    *ms;
+                       case LIMBO_ENTRY_PARENT:
+                               monitor_back_register_entry_parent(
+                                               el->el_e,
+                                               el->el_cb,
+                                               &el->el_base,
+                                               el->el_scope,
+                                               &el->el_filter );
+                               break;
+                               
 
-       assert( be );
+                       case LIMBO_ATTRS:
+                               monitor_back_register_entry_attrs(
+                                               &el->el_ndn,
+                                               el->el_a,
+                                               el->el_cb,
+                                               &el->el_base,
+                                               el->el_scope,
+                                               &el->el_filter );
+                               break;
 
-       /*
-        * opens the monitor backend
-        */
-       for ( ms = monitor_subsys; ms->mss_name != NULL; ms++ ) {
-               if ( ms->mss_init && ( *ms->mss_init )( be ) ) {
-                       return( -1 );
+                       case LIMBO_CB:
+                               monitor_back_register_entry_callback(
+                                               &el->el_ndn,
+                                               el->el_cb,
+                                               &el->el_base,
+                                               el->el_scope,
+                                               &el->el_filter );
+                               break;
+
+                       default:
+                               assert( 0 );
+                       }
+
+                       if ( el->el_e ) {
+                               entry_free( el->el_e );
+                       }
+                       if ( el->el_a ) {
+                               attrs_free( el->el_a );
+                       }
+                       if ( !BER_BVISNULL( &el->el_ndn ) ) {
+                               ber_memfree( el->el_ndn.bv_val );
+                       }
+                       if ( !BER_BVISNULL( &el->el_base ) ) {
+                               ber_memfree( el->el_base.bv_val );
+                       }
+                       if ( !BER_BVISNULL( &el->el_filter ) ) {
+                               ber_memfree( el->el_filter.bv_val );
+                       }
+
+                       tmp = el;
+                       el = el->el_next;
+                       ch_free( tmp );
                }
+
+               mi->mi_entry_limbo = NULL;
        }
 
        return( 0 );
@@ -687,13 +1736,12 @@ monitor_back_config(
        const char      *fname,
        int             lineno,
        int             argc,
-       char            **argv
-)
+       char            **argv )
 {
        /*
         * eventually, will hold backend specific configuration parameters
         */
-       return 0;
+       return SLAP_CONF_UNKNOWN;
 }
 
 int
@@ -702,30 +1750,54 @@ monitor_back_db_config(
        const char  *fname,
        int         lineno,
        int         argc,
-       char        **argv
-)
+       char        **argv )
 {
+#if 0
+       monitor_info_t  *mi = ( monitor_info_t * )be->be_private;
+#endif
+
        /*
         * eventually, will hold database specific configuration parameters
         */
-#ifdef NEW_LOGGING
-       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, "" );
-#endif
-       return( 0 );
+       return SLAP_CONF_UNKNOWN;
 }
 
 int
 monitor_back_db_destroy(
-       BackendDB       *be
-)
+       BackendDB       *be )
 {
+       monitor_info_t  *mi = ( monitor_info_t * )be->be_private;
+
        /*
         * FIXME: destroys all the data
         */
+       /* NOTE: mi points to static storage; don't free it */
+       
+       (void)monitor_cache_destroy( mi );
+
+       if ( monitor_subsys ) {
+               int     i;
+
+               for ( i = 0; monitor_subsys[ i ] != NULL; i++ ) {
+                       if ( monitor_subsys[ i ]->mss_destroy ) {
+                               monitor_subsys[ i ]->mss_destroy( be, monitor_subsys[ i ] );
+                       }
+
+                       if ( !BER_BVISNULL( &monitor_subsys[ i ]->mss_rdn ) ) {
+                               ch_free( monitor_subsys[ i ]->mss_rdn.bv_val );
+                       }
+               }
+
+               ch_free( monitor_subsys );
+       }
+       
        return 0;
 }
 
+#if SLAPD_MONITOR == SLAPD_MOD_DYNAMIC
+
+/* conditionally define the init_module() function */
+SLAP_BACKEND_INIT_MODULE( monitor )
+
+#endif /* SLAPD_MONITOR == SLAPD_MOD_DYNAMIC */
+