From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 9 Jun 2007 14:11:16 +0000 (+0000)
Subject: always complain when custom monitor stuff cannot be registered (ITS#4965)
X-Git-Tag: OPENLDAP_REL_ENG_2_4_MP~414
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d34473cdba9d733d43c64d6781041cce04b93d0d;p=openldap

always complain when custom monitor stuff cannot be registered (ITS#4965)
---

diff --git a/servers/slapd/back-monitor/init.c b/servers/slapd/back-monitor/init.c
index 40c526256c..00edb2f561 100644
--- a/servers/slapd/back-monitor/init.c
+++ b/servers/slapd/back-monitor/init.c
@@ -2140,6 +2140,8 @@ monitor_back_db_open(
 		" attributes, which must be explicitly requested."),
 		BER_BVNULL };
 
+	int			retcode = 0;
+
 	assert( be_monitor != NULL );
 	if ( be != be_monitor ) {
 		be_monitor = be;
@@ -2410,12 +2412,17 @@ monitor_back_db_open(
 			tmp = el;
 			el = el->el_next;
 			ch_free( tmp );
+
+			if ( rc != 0 ) {
+				/* try all, but report error at end */
+				retcode = 1;
+			}
 		}
 
 		mi->mi_entry_limbo = NULL;
 	}
 
-	return( 0 );
+	return retcode;
 }
 
 int