]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-monitor/backend.c
Completely untested built-in EXTERNAL implementation
[openldap] / servers / slapd / back-monitor / backend.c
index 17e1b41657359a0a5458033382a0b146aca95c09..9bef8a4fe38e84995d7220600ac24ee7c7478a62 100644 (file)
@@ -1,40 +1,29 @@
 /* backend.c - deals with backend subsystem */
-/*
- * Copyright 1998-2002 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-2003 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 "slap.h"
 #include "back-monitor.h"
@@ -51,7 +40,6 @@ monitor_subsys_backend_init(
        Entry                   *e, *e_backend, *e_tmp;
        int                     i;
        struct monitorentrypriv *mp;
-       struct berval           bv[2];
 
        mi = ( struct monitorinfo * )be->be_private;
 
@@ -59,10 +47,10 @@ monitor_subsys_backend_init(
                                &monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn, 
                                &e_backend ) ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+               LDAP_LOG( OPERATION, CRIT,
                        "monitor_subsys_backend_init: "
                        "unable to get entry '%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_backend_init: "
@@ -73,34 +61,41 @@ monitor_subsys_backend_init(
                return( -1 );
        }
 
-       bv[1].bv_val = NULL;
        e_tmp = NULL;
        for ( i = nBackendInfo; i--; ) {
-               char buf[1024];
-               BackendInfo *bi;
+               char            buf[ BACKMONITOR_BUFSIZE ];
+               BackendInfo     *bi;
+               struct berval   bv;
+               int             j;
 
                bi = &backendInfo[i];
 
                snprintf( buf, sizeof( buf ),
                                "dn: cn=Backend %d,%s\n"
-                               SLAPD_MONITOR_OBJECTCLASSES
-                               "cn: Backend %d\n",
+                               "objectClass: %s\n"
+                               "structuralObjectClass: %s\n"
+                               "cn: Backend %d\n"
+                               "createTimestamp: %s\n"
+                               "modifyTimestamp: %s\n",
                                i,
                                monitor_subsys[SLAPD_MONITOR_BACKEND].mss_dn.bv_val,
-                               i );
+                               mi->mi_oc_monitoredObject->soc_cname.bv_val,
+                               mi->mi_oc_monitoredObject->soc_cname.bv_val,
+                               i,
+                               mi->mi_startTime.bv_val,
+                               mi->mi_startTime.bv_val );
                
                e = str2entry( buf );
                if ( e == NULL ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+                       LDAP_LOG( OPERATION, CRIT,
                                "monitor_subsys_backend_init: "
                                "unable to create entry 'cn=Backend %d,%s'\n",
-                               i, 
-                               monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val ));
+                               i, monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "monitor_subsys_backend_init: "
-                               "unable to create entry 'Backend cn=%d,%s'\n%s",
+                               "unable to create entry 'cn=Backend %d,%s'\n%s",
                                i, 
                                monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val,
                                "" );
@@ -108,11 +103,41 @@ monitor_subsys_backend_init(
                        return( -1 );
                }
                
-               bv[0].bv_val = bi->bi_type;
-               bv[0].bv_len = strlen( bv[0].bv_val );
+               bv.bv_val = 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_backend, mi->mi_ad_monitoredInfo,
+                               &bv, NULL );
+
+               if ( bi->bi_controls ) {
+                       int j;
+
+                       for ( j = 0; bi->bi_controls[ j ]; j++ ) {
+                               bv.bv_val = bi->bi_controls[ j ];
+                               bv.bv_len = strlen( bv.bv_val );
+                               attr_merge_one( e, slap_schema.si_ad_supportedControl, &bv, NULL );
+                       }
+               }
 
-               attr_merge( e, monitor_ad_desc, bv );
-               attr_merge( e_backend, monitor_ad_desc, bv );
+               for ( j = 0; j < nBackendDB; j++ ) {
+                       BackendDB       *be = &backendDB[j];
+                       char            buf[ SLAP_LDAPDN_MAXLEN ];
+                       struct berval   dn;
+                       
+                       if ( be->bd_info != bi ) {
+                               continue;
+                       }
+
+                       snprintf( buf, sizeof( buf ), "cn=Database %d,%s",
+                                       j, monitor_subsys[SLAPD_MONITOR_DATABASE].mss_dn.bv_val );
+                       dn.bv_val = buf;
+                       dn.bv_len = strlen( buf );
+
+                       attr_merge_normalize_one( e, mi->mi_ad_seeAlso,
+                                       &dn, NULL );
+               }
                
                mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
                e->e_private = ( void * )mp;
@@ -124,11 +149,10 @@ monitor_subsys_backend_init(
 
                if ( monitor_cache_add( mi, e ) ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+                       LDAP_LOG( OPERATION, CRIT,
                                "monitor_subsys_backend_init: "
                                "unable to add entry 'cn=Backend %d,%s'\n",
-                               i,
-                               monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val ));
+                               i, monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "monitor_subsys_backend_init: "