From: Pierangelo Masarati <ando@openldap.org>
Date: Sun, 25 Jul 2004 22:57:52 +0000 (+0000)
Subject: fix ITS#3254
X-Git-Tag: OPENDLAP_REL_ENG_2_2_MP~23
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=392366818e57a0a3419317c2f58e3c7c32d507b8;p=openldap

fix ITS#3254
---

diff --git a/servers/slapd/back-monitor/listener.c b/servers/slapd/back-monitor/listener.c
index 20695a664e..707cd06631 100644
--- a/servers/slapd/back-monitor/listener.c
+++ b/servers/slapd/back-monitor/listener.c
@@ -39,35 +39,39 @@ monitor_subsys_listener_init(
 
 	assert( be != NULL );
 
-	mi = ( struct monitorinfo * )be->be_private;
+	if ( ( l = slapd_get_listeners() ) == NULL ) {
+		if ( slapMode & SLAP_TOOL_MODE ) {
+			return 0;
+		}
 
-	if ( monitor_cache_get( mi, 
-				&monitor_subsys[SLAPD_MONITOR_LISTENER].mss_ndn, 
-				&e_listener ) ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG( OPERATION, CRIT,
 			"monitor_subsys_listener_init: "
-			"unable to get entry '%s'\n",
-			monitor_subsys[SLAPD_MONITOR_LISTENER].mss_ndn.bv_val, 0, 0 );
+			"unable to get listeners\n", 0, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY,
 			"monitor_subsys_listener_init: "
-			"unable to get entry '%s'\n%s%s",
-			monitor_subsys[SLAPD_MONITOR_LISTENER].mss_ndn.bv_val, 
-			"", "" );
+			"unable to get listeners\n", 0, 0, 0 );
 #endif
 		return( -1 );
 	}
 
-	if ( ( l = slapd_get_listeners() ) == NULL ) {
+	mi = ( struct monitorinfo * )be->be_private;
+
+	if ( monitor_cache_get( mi, 
+				&monitor_subsys[SLAPD_MONITOR_LISTENER].mss_ndn, 
+				&e_listener ) ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG( OPERATION, CRIT,
 			"monitor_subsys_listener_init: "
-			"unable to get listeners\n", 0, 0, 0 );
+			"unable to get entry '%s'\n",
+			monitor_subsys[SLAPD_MONITOR_LISTENER].mss_ndn.bv_val, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY,
 			"monitor_subsys_listener_init: "
-			"unable to get listeners\n", 0, 0, 0 );
+			"unable to get entry '%s'\n%s%s",
+			monitor_subsys[SLAPD_MONITOR_LISTENER].mss_ndn.bv_val, 
+			"", "" );
 #endif
 		return( -1 );
 	}