Fix LBER_ERROR vs. -1 confusion.

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

diff --git a/servers/slapd/back-monitor/listener.c b/servers/slapd/back-monitor/listener.c
index 7dc98bed559ee3533e4e648968b320f8b6e7b354..71879643f713cccbba70a1cc37039dd4ccb3cbe9 100644 (file)
--- a/servers/slapd/back-monitor/listener.c
+++ b/servers/slapd/back-monitor/listener.c
@@ -1,6 +1,6 @@
 /* listener.c - deals with listener subsystem */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*
@@ -58,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: "
@@ -74,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: "
@@ -99,18 +99,16 @@ 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 ) {
 #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: "
@@ -151,11 +149,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: "