Plug memory leak

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

diff --git a/servers/slapd/back-monitor/backend.c b/servers/slapd/back-monitor/backend.c
index 0d5ae841d82683309e0a757339b979761519a002..987c2b348be1188eb1699d9efebdb51df5382ffd 100644 (file)
--- a/servers/slapd/back-monitor/backend.c
+++ b/servers/slapd/back-monitor/backend.c
@@ -1,12 +1,9 @@
 /* backend.c - deals with backend subsystem */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*
- * Copyright 2001 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- * 
  * Copyright 2001, Pierangelo Masarati, All rights reserved. <ando@sys-net.it>
  * 
  * This work has beed deveolped for the OpenLDAP Foundation 
@@ -54,7 +51,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;
 
@@ -62,10 +58,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: "
@@ -76,24 +72,18 @@ 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[1024];
+               BackendInfo     *bi;
+               struct berval   bv[ 2 ];
 
                bi = &backendInfo[i];
 
                snprintf( buf, sizeof( buf ),
-                               "dn: cn=%d,%s\n"
-                               "objectClass: top\n"
-                               "objectClass: LDAPsubEntry\n"
-#ifdef SLAPD_MONITORSUBENTRY
-                               "objectClass: monitorSubEntry\n"
-#else /* !SLAPD_MONITORSUBENTRY */
-                               "objectClass: extensibleObject\n"
-#endif /* !SLAPD_MONITORSUBENTRY */
-                               "cn: %d\n",
+                               "dn: cn=Backend %d,%s\n"
+                               SLAPD_MONITOR_OBJECTCLASSES
+                               "cn: Backend %d\n",
                                i,
                                monitor_subsys[SLAPD_MONITOR_BACKEND].mss_dn.bv_val,
                                i );
@@ -101,15 +91,14 @@ monitor_subsys_backend_init(
                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=%d,%s'\n",
-                               i, 
-                               monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val ));
+                               "unable to create entry 'cn=Backend %d,%s'\n",
+                               i, monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "monitor_subsys_backend_init: "
-                               "unable to create entry '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,
                                "" );
@@ -119,9 +108,20 @@ monitor_subsys_backend_init(
                
                bv[0].bv_val = bi->bi_type;
                bv[0].bv_len = strlen( bv[0].bv_val );
+               bv[1].bv_val = NULL;
 
                attr_merge( e, monitor_ad_desc, bv );
                attr_merge( e_backend, monitor_ad_desc, bv );
+
+               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 );
+                       }
+               }
                
                mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
                e->e_private = ( void * )mp;
@@ -133,15 +133,14 @@ 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=%d,%s'\n",
-                               i,
-                               monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val ));
+                               "unable to add entry 'cn=Backend %d,%s'\n",
+                               i, monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "monitor_subsys_backend_init: "
-                               "unable to add entry 'cn=%d,%s'\n%s",
+                               "unable to add entry 'cn=Backend %d,%s'\n%s",
                                i,
                                monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val,
                                "" );