Sync with HEAD

diff --git a/servers/slapd/back-monitor/listener.c b/servers/slapd/back-monitor/listener.c
index 2f8b3b8037b204461434778aeb008d0286ebcbe4..6eac7660566f063a494a0cfeecb32d0522a2f4e0 100644 (file)
--- 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 800ada5dc0fd8473fc83d2c62f355543a6c53da1..2795ee7be1ba50b3c5fe8db7a1dc9242133987cb 100644 (file)
--- 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;