From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 29 Oct 2002 02:17:35 +0000 (+0000)
Subject: Sync with HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_1_9~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cffa47111a0aba3efd4183e9735b676beff45440;p=thirdparty%2Fopenldap.git

Sync with HEAD
---

diff --git a/servers/slapd/back-monitor/listener.c b/servers/slapd/back-monitor/listener.c
index 2f8b3b8037..6eac766056 100644
--- a/servers/slapd/back-monitor/listener.c
+++ b/servers/slapd/back-monitor/listener.c
@@ -99,9 +99,8 @@ monitor_subsys_listener_init(
 				i,
 				monitor_subsys[SLAPD_MONITOR_LISTENER].mss_dn.bv_val,
 				i,
-				l[i]->sl_name,
-
-				l[i]->sl_url );
+				l[i]->sl_name.bv_val,
+				l[i]->sl_url.bv_val );
 		
 		e = str2entry( buf );
 		if ( e == NULL ) {
diff --git a/servers/slapd/back-monitor/search.c b/servers/slapd/back-monitor/search.c
index 800ada5dc0..2795ee7be1 100644
--- a/servers/slapd/back-monitor/search.c
+++ b/servers/slapd/back-monitor/search.c
@@ -152,7 +152,7 @@ monitor_back_search(
 )
 {
 	struct monitorinfo	*mi = (struct monitorinfo *) be->be_private;
-	int		rc;
+	int		rc = LDAP_SUCCESS;
 	Entry		*e, *matched = NULL;
 	int		nentries = 0;
 
@@ -174,7 +174,7 @@ monitor_back_search(
 			monitor_cache_release( mi, matched );
 		}
 
-		return( 0 );
+		return( rc );
 	}
 
 	nentries = 0;