Completely untested built-in EXTERNAL implementation

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

diff --git a/servers/slapd/back-monitor/backend.c b/servers/slapd/back-monitor/backend.c
index 91a7802a9f0b2798aca4834e718e5b6308762f27..9bef8a4fe38e84995d7220600ac24ee7c7478a62 100644 (file)
--- a/servers/slapd/back-monitor/backend.c
+++ b/servers/slapd/back-monitor/backend.c
@@ -1,40 +1,29 @@
 /* backend.c - deals with backend subsystem */
-/*
- * 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-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"
@@ -74,19 +63,27 @@ monitor_subsys_backend_init(
 
        e_tmp = NULL;
        for ( i = nBackendInfo; i--; ) {
-               char            buf[1024];
+               char            buf[ BACKMONITOR_BUFSIZE ];
                BackendInfo     *bi;
-               struct berval   bv[ 2 ];
+               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 ) {
@@ -106,21 +103,40 @@ monitor_subsys_backend_init(
                        return( -1 );
                }
                
-               bv[0].bv_val = bi->bi_type;
-               bv[0].bv_len = strlen( bv[0].bv_val );
-               bv[1].bv_val = NULL;
+               bv.bv_val = bi->bi_type;
+               bv.bv_len = strlen( bv.bv_val );
 
-               attr_merge( e, monitor_ad_desc, bv );
-               attr_merge( e_backend, monitor_ad_desc, bv );
+               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[0].bv_val = bi->bi_controls[ j ];
-                               bv[0].bv_len = strlen( bv[0].bv_val );
-                               attr_merge( e, slap_schema.si_ad_supportedControl, bv );
+                               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 );
+                       }
+               }
+
+               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 );