From 699542e83a16ff971a9050ffeb4f0f9946e749a0 Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@openldap.org>
Date: Mon, 8 Oct 2007 11:48:15 +0000
Subject: [PATCH] ITS#5164 from HEAD

---
 servers/slapd/back-monitor/conn.c     |  2 +-
 servers/slapd/back-monitor/database.c | 30 +++++++++++++++------------
 servers/slapd/slapi/plugin.c          |  2 +-
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/servers/slapd/back-monitor/conn.c b/servers/slapd/back-monitor/conn.c
index 45ceade054..aeaa61f529 100644
--- a/servers/slapd/back-monitor/conn.c
+++ b/servers/slapd/back-monitor/conn.c
@@ -391,7 +391,7 @@ conn_create(
 			
 			buf2,
 			buf3 );
-	attr_merge_one( e, mi->mi_ad_monitoredInfo, &bv, NULL );
+	attr_merge_normalize_one( e, mi->mi_ad_monitoredInfo, &bv, NULL );
 #endif /* MONITOR_LEGACY_CONN */
 
 	bv.bv_len = snprintf( buf, sizeof( buf ), "%lu", c->c_connid );
diff --git a/servers/slapd/back-monitor/database.c b/servers/slapd/back-monitor/database.c
index 2223997cb0..5bbbbbfbef 100644
--- a/servers/slapd/back-monitor/database.c
+++ b/servers/slapd/back-monitor/database.c
@@ -151,7 +151,7 @@ monitor_subsys_database_init_one(
 	}
 
 	ber_str2bv( bi->bi_type, 0, 0, &bv );
-	attr_merge_one( e, mi->mi_ad_monitoredInfo, &bv, NULL );
+	attr_merge_normalize_one( e, mi->mi_ad_monitoredInfo, &bv, NULL );
 	attr_merge_one( e, mi->mi_ad_monitorIsShadow,
 		SLAP_SHADOW( be ) ? (struct berval *)&slap_true_bv :
 			(struct berval *)&slap_false_bv, NULL );
@@ -295,7 +295,7 @@ monitor_subsys_database_init_one(
 				return( -1 );
 			}
 			ber_str2bv( on->on_bi.bi_type, 0, 0, &bv );
-			attr_merge_one( e_overlay, mi->mi_ad_monitoredInfo, &bv, NULL );
+			attr_merge_normalize_one( e_overlay, mi->mi_ad_monitoredInfo, &bv, NULL );
 
 			bv.bv_len = snprintf( buf, sizeof( buf ), "cn=Overlay %d,%s",
 				j, ms_overlay->mss_dn.bv_val );
@@ -926,17 +926,21 @@ monitor_back_add_plugin( monitor_info_t *mi, Backend *be, Entry *e_database )
 		if ( rc != LDAP_SUCCESS ) {
 			goto done;
 		}
-
-		snprintf( buf, sizeof(buf),
-				"plugin %d name: %s; "
-				"vendor: %s; "
-				"version: %s; "
-				"description: %s", 
-				i,
-				srchdesc->spd_id,
-				srchdesc->spd_vendor,
-				srchdesc->spd_version,
-				srchdesc->spd_description );
+		if ( srchdesc ) {
+			snprintf( buf, sizeof(buf),
+					"plugin %d name: %s; "
+					"vendor: %s; "
+					"version: %s; "
+					"description: %s", 
+					i,
+					srchdesc->spd_id,
+					srchdesc->spd_vendor,
+					srchdesc->spd_version,
+					srchdesc->spd_description );
+		} else {
+			snprintf( buf, sizeof(buf),
+					"plugin %d name: <no description available>", i );
+		}
 
 		ber_str2bv( buf, 0, 0, &bv );
 		attr_merge_normalize_one( e_database,
diff --git a/servers/slapd/slapi/plugin.c b/servers/slapd/slapi/plugin.c
index da0085ca50..1a2234520a 100644
--- a/servers/slapd/slapi/plugin.c
+++ b/servers/slapd/slapi/plugin.c
@@ -598,7 +598,7 @@ slapi_int_call_plugins(
 	rc = slapi_int_get_plugins( be, funcType, &tmpPlugin );
 	if ( rc != LDAP_SUCCESS || tmpPlugin == NULL ) {
 		/* Nothing to do, front-end should ignore. */
-		return 1;
+		return rc;
 	}
 
 	for ( pGetPlugin = tmpPlugin ; *pGetPlugin != NULL; pGetPlugin++ ) {
-- 
2.39.2