Simpler fix for NO_THREADS

[openldap] / servers / slapd / back-monitor / listener.c

diff --git a/servers/slapd/back-monitor/listener.c b/servers/slapd/back-monitor/listener.c
index 8f90519121fa959b0b8fbe6191dc5382276e715b..2f8b3b8037b204461434778aeb008d0286ebcbe4 100644 (file)
--- a/servers/slapd/back-monitor/listener.c
+++ b/servers/slapd/back-monitor/listener.c
@@ -47,7 +47,6 @@ monitor_subsys_listener_init(
        Entry                   *e, *e_listener, *e_tmp;
        int                     i;
        struct monitorentrypriv *mp;
-       struct berval           bv[2];
        Listener                **l;
 
        assert( be != NULL );
@@ -59,10 +58,10 @@ monitor_subsys_listener_init(
                                &monitor_subsys[SLAPD_MONITOR_LISTENER].mss_ndn, 
                                &e_listener ) ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+               LDAP_LOG( OPERATION, CRIT,
                        "monitor_subsys_listener_init: "
                        "unable to get entry '%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_LISTENER].mss_ndn.bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_LISTENER].mss_ndn.bv_val, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_listener_init: "
@@ -75,9 +74,9 @@ monitor_subsys_listener_init(
 
        if ( ( l = slapd_get_listeners() ) == NULL ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+               LDAP_LOG( OPERATION, CRIT,
                        "monitor_subsys_listener_init: "
-                       "unable to get listeners\n" ));
+                       "unable to get listeners\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_listener_init: "
@@ -107,11 +106,10 @@ monitor_subsys_listener_init(
                e = str2entry( buf );
                if ( e == NULL ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+                       LDAP_LOG( OPERATION, CRIT,
                                "monitor_subsys_listener_init: "
                                "unable to create entry 'cn=Listener, %d,%s'\n",
-                               i,
-                               monitor_subsys[SLAPD_MONITOR_LISTENER].mss_ndn.bv_val ));
+                               i, monitor_subsys[SLAPD_MONITOR_LISTENER].mss_ndn.bv_val, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "monitor_subsys_listener_init: "
@@ -125,6 +123,7 @@ monitor_subsys_listener_init(
 
 #ifdef HAVE_TLS
                if ( l[i]->sl_is_tls ) {
+                       struct berval bv[2];
                        bv[1].bv_val = NULL;
                        bv[0].bv_val = "TLS";
                        bv[0].bv_len = sizeof("TLS")-1;
@@ -133,6 +132,7 @@ monitor_subsys_listener_init(
 #endif /* HAVE_TLS */
 #ifdef LDAP_CONNECTIONLESS
                if ( l[i]->sl_is_udp ) {
+                       struct berval bv[2];
                        bv[1].bv_val = NULL;
                        bv[0].bv_val = "UDP";
                        bv[0].bv_len = sizeof("UDP")-1;
@@ -150,11 +150,10 @@ monitor_subsys_listener_init(
 
                if ( monitor_cache_add( mi, e ) ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+                       LDAP_LOG( OPERATION, CRIT,
                                "monitor_subsys_listener_init: "
                                "unable to add entry 'cn=Listener %d,%s'\n",
-                               i,
-                               monitor_subsys[SLAPD_MONITOR_LISTENER].mss_ndn.bv_val ));
+                               i, monitor_subsys[SLAPD_MONITOR_LISTENER].mss_ndn.bv_val, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "monitor_subsys_listener_init: "