unifdef -UNEW_LOGGING

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

diff --git a/servers/slapd/back-monitor/operation.c b/servers/slapd/back-monitor/operation.c
index 284224d378d4876edb6c10a2e3aa60f9c493826a..1427104520071fc2027c06e64e50ed0205cedefe 100644 (file)
--- a/servers/slapd/back-monitor/operation.c
+++ b/servers/slapd/back-monitor/operation.c
@@ -62,18 +62,11 @@ monitor_subsys_ops_init(
 
        if ( monitor_cache_get( mi,
                        &monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn, &e_op ) ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( OPERATION, CRIT,
-                       "monitor_subsys_ops_init: "
-                       "unable to get entry '%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val, 0, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_ops_init: "
                        "unable to get entry '%s'\n%s%s",
                        monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val, 
                        "", "" );
-#endif
                return( -1 );
        }
 
@@ -112,19 +105,11 @@ monitor_subsys_ops_init(
 
                e = str2entry( buf );
                if ( e == NULL ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( OPERATION, CRIT,
-                               "monitor_subsys_ops_init: "
-                               "unable to create entry 'cn=%s,%s'\n",
-                               bv_op[ i ].bv_val,
-                               monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val, 0 );
-#else
                        Debug( LDAP_DEBUG_ANY,
                                "monitor_subsys_ops_init: "
                                "unable to create entry 'cn=%s,%s'\n",
                                bv_op[ i ].bv_val,
                                monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val, 0 );
-#endif
                        return( -1 );
                }
        
@@ -137,19 +122,11 @@ monitor_subsys_ops_init(
                        | MONITOR_F_SUB | MONITOR_F_PERSISTENT;
 
                if ( monitor_cache_add( mi, e ) ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( OPERATION, CRIT,
-                               "monitor_subsys_ops_init: "
-                               "unable to add entry 'cn=%s,%s'\n",
-                               bv_op[ i ].bv_val,
-                               monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val, 0 );
-#else
                        Debug( LDAP_DEBUG_ANY,
                                "monitor_subsys_ops_init: "
                                "unable to add entry 'cn=%s,%s'\n",
                                bv_op[ i ].bv_val,
                                monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val, 0 );
-#endif
                        return( -1 );
                }