unifdef -UNEW_LOGGING

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

diff --git a/servers/slapd/back-monitor/rww.c b/servers/slapd/back-monitor/rww.c
index 0bc517c3e741df54f7e000f82c88337afc4be8d9..e6818c6bc2b47b5634cd02585ce6c29b71103b21 100644 (file)
--- a/servers/slapd/back-monitor/rww.c
+++ b/servers/slapd/back-monitor/rww.c
@@ -46,18 +46,11 @@ monitor_subsys_rww_init(
 
        if ( monitor_cache_get( mi,
                        &monitor_subsys[SLAPD_MONITOR_RWW].mss_ndn, &e_conn ) ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( OPERATION, CRIT,
-                       "monitor_subsys_rww_init: "
-                       "unable to get entry '%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_RWW].mss_ndn.bv_val, 0, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_rww_init: "
                        "unable to get entry '%s'\n%s%s",
                        monitor_subsys[SLAPD_MONITOR_RWW].mss_ndn.bv_val, 
                        "", "" );
-#endif
                return( -1 );
        }
 
@@ -85,17 +78,10 @@ monitor_subsys_rww_init(
        
        e = str2entry( buf );
        if ( e == NULL ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( OPERATION, CRIT,
-                       "monitor_subsys_rww_init: "
-                       "unable to create entry 'cn=Read,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_RWW].mss_ndn.bv_val, 0, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_rww_init: "
                        "unable to create entry 'cn=Read,%s'\n",
                        monitor_subsys[SLAPD_MONITOR_RWW].mss_ndn.bv_val, 0, 0 );
-#endif
                return( -1 );
        }
        
@@ -112,17 +98,10 @@ monitor_subsys_rww_init(
                | MONITOR_F_SUB | MONITOR_F_PERSISTENT;
 
        if ( monitor_cache_add( mi, e ) ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( OPERATION, CRIT,
-                       "monitor_subsys_rww_init: "
-                       "unable to add entry 'cn=Read,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_RWW].mss_ndn.bv_val, 0, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_rww_init: "
                        "unable to add entry 'cn=Read,%s'\n",
                        monitor_subsys[SLAPD_MONITOR_RWW].mss_ndn.bv_val, 0, 0 );
-#endif
                return( -1 );
        }
        
@@ -150,17 +129,10 @@ monitor_subsys_rww_init(
        
        e = str2entry( buf );
        if ( e == NULL ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( OPERATION, CRIT,
-                       "monitor_subsys_rww_init: "
-                       "unable to create entry 'cn=Write,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_RWW].mss_ndn.bv_val, 0, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_rww_init: "
                        "unable to create entry 'cn=Write,%s'\n",
                        monitor_subsys[SLAPD_MONITOR_RWW].mss_ndn.bv_val, 0, 0 );
-#endif
                return( -1 );
        }
        
@@ -177,17 +149,10 @@ monitor_subsys_rww_init(
                | MONITOR_F_SUB | MONITOR_F_PERSISTENT;
 
        if ( monitor_cache_add( mi, e ) ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( OPERATION, CRIT,
-                       "monitor_subsys_rww_init: "
-                       "unable to add entry 'cn=Write,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_RWW].mss_ndn.bv_val, 0, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_rww_init: "
                        "unable to add entry 'cn=Write,%s'\n",
                        monitor_subsys[SLAPD_MONITOR_RWW].mss_ndn.bv_val, 0, 0 );
-#endif
                return( -1 );
        }