From: Pierangelo Masarati <ando@openldap.org>
Date: Sun, 7 Jan 2007 18:53:09 +0000 (+0000)
Subject: don't leave attrs with no values 'round; fix description
X-Git-Tag: OPENLDAP_REL_ENG_2_4_4ALPHA~8^2~248
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=da8dd8066dec5e63dab8b8f019fe3eb913ce0d65;p=openldap

don't leave attrs with no values 'round; fix description
---

diff --git a/servers/slapd/back-monitor/thread.c b/servers/slapd/back-monitor/thread.c
index 51da57fa37..387d71ead3 100644
--- a/servers/slapd/back-monitor/thread.c
+++ b/servers/slapd/back-monitor/thread.c
@@ -85,7 +85,7 @@ static struct {
 		BER_BVC("Queue of running threads - besides those handling operations"),
 		BER_BVNULL,	LDAP_PVT_THREAD_POOL_PARAM_UNKNOWN,	MT_RUNQUEUE },
 	{ BER_BVC( "cn=Tasklist" ),
-		BER_BVC("List of standby threads - besides those handling operations"),
+		BER_BVC("List of running plus standby threads - besides those handling operations"),
 		BER_BVNULL,	LDAP_PVT_THREAD_POOL_PARAM_UNKNOWN,	MT_TASKLIST },
 
 	{ BER_BVNULL }
@@ -278,6 +278,9 @@ monitor_subsys_thread_update(
 			if ( vals ) {
 				attr_merge_normalize( e, mi->mi_ad_monitoredInfo, vals, NULL );
 				ber_bvarray_free( vals );
+
+			} else {
+				attr_delete( &e->e_attrs, mi->mi_ad_monitoredInfo );
 			}
 			break;
 
@@ -307,6 +310,9 @@ monitor_subsys_thread_update(
 			if ( vals ) {
 				attr_merge_normalize( e, mi->mi_ad_monitoredInfo, vals, NULL );
 				ber_bvarray_free( vals );
+
+			} else {
+				attr_delete( &e->e_attrs, mi->mi_ad_monitoredInfo );
 			}
 			break;