unifdef -UNEW_LOGGING

[openldap] / servers / slapd / back-ldbm / config.c

diff --git a/servers/slapd/back-ldbm/config.c b/servers/slapd/back-ldbm/config.c
index 7b55450c1ff14db9f6df56b5eb75939522501235..cf92272b746968176abe36ce181b8c3cef23de54 100644 (file)
--- a/servers/slapd/back-ldbm/config.c
+++ b/servers/slapd/back-ldbm/config.c
@@ -115,32 +115,18 @@ ldbm_back_db_config(
 #ifndef NO_THREADS
                int i;
                if ( argc < 2 ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG ( CONFIG, ERR, "ldbm_back_db_config: %s: "
-                               "line %d: missing frequency value in \"dbsync <frequency> "
-                               "[<wait-times> [wait-interval]]\" line\n", fname, lineno, 0 );
-#else  
                        Debug( LDAP_DEBUG_ANY,
     "%s: line %d: missing frquency value in \"dbsync <frequency> [<wait-times> [wait-interval]]\" line\n",
                            fname, lineno, 0 );
-#endif
                        return 1;
                }
 
                i = atoi( argv[1] );
 
                if( i < 0 ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG ( CONFIG, ERR, 
-                               "ldbm_back_db_config: %s: "
-                               "line %d: frequency value (%d) invalid \"dbsync "
-                               "<frequency> [<wait-times> [wait-interval]]\" line\n", 
-                               fname, lineno, i );
-#else  
                        Debug( LDAP_DEBUG_ANY,
     "%s: line %d: frquency value (%d) invalid \"dbsync <frequency> [<wait-times> [wait-interval]]\" line\n",
                            fname, lineno, i );
-#endif
                        return 1;
                }
 
@@ -149,16 +135,9 @@ ldbm_back_db_config(
                if ( argc > 2 ) {
                        i = atoi( argv[2] );
                        if ( i < 0 ) {
-#ifdef NEW_LOGGING
-                               LDAP_LOG ( CONFIG,ERR, "ldbm_back_db_config: %s: "
-                                       "line %d: frequency value (%d) invalid \"dbsync "
-                                       "<frequency> [<wait-times> [wait-interval]]\" line\n", 
-                                       fname, lineno, i );
-#else  
                                Debug( LDAP_DEBUG_ANY,
            "%s: line %d: frquency value (%d) invalid \"dbsync <frequency> [<wait-times> [wait-interval]]\" line\n",
                                    fname, lineno, i );
-#endif
                                return 1;
                        }
                        li ->li_dbsyncwaitn = i;
@@ -167,16 +146,9 @@ ldbm_back_db_config(
                if ( argc > 3 ) {
                        i = atoi( argv[3] );
                        if ( i <= 0 ) {
-#ifdef NEW_LOGGING
-                               LDAP_LOG ( CONFIG,ERR, "ldbm_back_db_config: %s: "
-                                       "line %d: frequency value (%d) invalid \"dbsync "
-                                       "<frequency> [<wait-times> [wait-interval]]\" line\n", 
-                                       fname, lineno, i );
-#else  
                                Debug( LDAP_DEBUG_ANY,
            "%s: line %d: frquency value (%d) invalid \"dbsync <frequency> [<wait-times> [wait-interval]]\" line\n",
                                    fname, lineno, i );
-#endif
                                return 1;
                        }
                        li ->li_dbsyncwaitinterval = i;
@@ -186,13 +158,8 @@ ldbm_back_db_config(
                li->li_dbwritesync = 0;
 
 #else
-#ifdef NEW_LOGGING
-               LDAP_LOG ( CONFIG, ERR, "ldbm_back_db_config: \"dbsync\""
-                       " policies not supported in non-threaded environments\n", 0, 0, 0 );
-#else  
                Debug( LDAP_DEBUG_ANY,
     "\"dbsync\" policies not supported in non-threaded environments\n", 0, 0, 0);
-#endif
                return 1;
 #endif