ITS#4587: selfwrite access is broken

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

diff --git a/servers/slapd/back-monitor/backend.c b/servers/slapd/back-monitor/backend.c
index 976b68a5eb103a9481bbba5867e638673f248893..89e346fc4332fb501840c9ccac9dfb3f4baa12d0 100644 (file)
--- a/servers/slapd/back-monitor/backend.c
+++ b/servers/slapd/back-monitor/backend.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2001-2005 The OpenLDAP Foundation.
+ * Copyright 2001-2006 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -57,8 +57,7 @@ monitor_subsys_backend_init(
                return -1;
        }
 
-       if ( monitor_cache_get( mi, &ms->mss_ndn, &e_backend ) )
-       {
+       if ( monitor_cache_get( mi, &ms->mss_ndn, &e_backend ) ) {
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_backend_init: "
                        "unable to get entry \"%s\"\n",
@@ -73,7 +72,7 @@ monitor_subsys_backend_init(
        i = -1;
        LDAP_STAILQ_FOREACH( bi, &backendInfo, bi_next ) {
                char            buf[ BACKMONITOR_BUFSIZE ];
-               BackendDB               *be;
+               BackendDB       *be;
                struct berval   bv;
                int             j;
                Entry           *e;
@@ -85,6 +84,8 @@ monitor_subsys_backend_init(
                                "objectClass: %s\n"
                                "structuralObjectClass: %s\n"
                                "cn: Backend %d\n"
+                               "%s: %s\n"
+                               "%s: %s\n"
                                "creatorsName: %s\n"
                                "modifiersName: %s\n"
                                "createTimestamp: %s\n"
@@ -94,6 +95,10 @@ monitor_subsys_backend_init(
                                mi->mi_oc_monitoredObject->soc_cname.bv_val,
                                mi->mi_oc_monitoredObject->soc_cname.bv_val,
                                i,
+                               mi->mi_ad_monitoredInfo->ad_cname.bv_val,
+                                       bi->bi_type,
+                               mi->mi_ad_monitorRuntimeConfig->ad_cname.bv_val,
+                                       bi->bi_cf_ocs == NULL ? "FALSE" : "TRUE",
                                mi->mi_creatorsName.bv_val,
                                mi->mi_creatorsName.bv_val,
                                mi->mi_startTime.bv_val,
@@ -109,8 +114,6 @@ monitor_subsys_backend_init(
                }
                
                ber_str2bv( bi->bi_type, 0, 0, &bv );
-               attr_merge_normalize_one( e, mi->mi_ad_monitoredInfo,
-                               &bv, NULL );
                attr_merge_normalize_one( e_backend, mi->mi_ad_monitoredInfo,
                                &bv, NULL );