import fix to ITS#3254 from HEAD; cleanup

diff --git a/CHANGES b/CHANGES
index 0af72ef1fbdd317b887b893a619a161ccaee9478..ff8a6555c961248b12a1abe647534b7b84a6ffd4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,7 @@ OpenLDAP 2.2.15 Engineering
        Fixed back-hdb dn2id bug with unsigned chars
        Fixed back-ldap shared connections failover (ITS#3217)
        Fixed back-ldap validate/pretty values (ITS#3218)
+       Fixed back-monitor/backglue clash in tool mode (ITS#3254)
        Fixed slapi slapi_int_compute_output_ber attrs bug
        Fixed slapd uniqueMember/nameUID bugs (ITS#3210)
        Fixed slapd uniqueMemberMatch empty DN portion bug (ITS#3247)
@@ -23,8 +24,8 @@ OpenLDAP 2.2.15 Engineering
        Fixed libldap matchedValues parsing bug (ITS#3208,3216)
        Fixed libldap DN '=' handling
        Fixed libldap_r runqueue bug
-       Updated libldap_r read/writer locks
        Fixed librewrite empty rewriteContext leak (ITS#3256)
+       Updated libldap_r read/writer locks
        Build environments
                Added additional res_query detection for MacOS X
                Added default ldapi:// SSF build setting

diff --git a/servers/slapd/back-monitor/listener.c b/servers/slapd/back-monitor/listener.c
index cbfd0ffde35465cc5b394e3a5b700a6cd4363690..0b28388da35f60a2d40e8e3ecd8cef60048af56e 100644 (file)
--- 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 );
        }