Sync with HEAD:

[openldap] / servers / slapd / back-bdb / init.c

diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index 9d33f9537104c8625a7c361aa97d75247f0d206c..9250f94f082d3d1d1a2cc7044fdf633048fccdf9 100644 (file)
--- a/servers/slapd/back-bdb/init.c
+++ b/servers/slapd/back-bdb/init.c
@@ -67,13 +67,9 @@ bdb_db_init( BackendDB *be )
 {
        struct bdb_info *bdb;
 
-#ifdef NEW_LOGGING
-       LDAP_LOG( BACK_BDB, ENTRY, "bdb_db_init", 0, 0, 0 );
-#else
        Debug( LDAP_DEBUG_ANY,
-               "bdb_db_init: Initializing %s database\n",
-               be->bd_info->bi_type, 0, 0 );
-#endif
+               LDAP_XSTRING(bdb_db_init) ": Initializing "
+               BDB_UCTYPE " database\n", 0, 0, 0 );
 
        /* allocate backend-database-specific stuff */
        bdb = (struct bdb_info *) ch_calloc( 1, sizeof(struct bdb_info) );
@@ -138,24 +134,14 @@ bdb_db_open( BackendDB *be )
        char path[MAXPATHLEN];
 #endif
 
-#ifdef NEW_LOGGING
-       LDAP_LOG( BACK_BDB, ARGS, 
-               "bdb_db_open: %s\n", be->be_suffix[0].bv_val, 0, 0 );
-#else
        Debug( LDAP_DEBUG_ARGS,
                "bdb_db_open: %s\n",
                be->be_suffix[0].bv_val, 0, 0 );
-#endif
 
 #ifndef BDB_MULTIPLE_SUFFIXES
        if ( be->be_suffix[1].bv_val ) {
-#ifdef NEW_LOGGING
-       LDAP_LOG( BACK_BDB, ERR, 
-               "bdb_db_open: only one suffix allowed\n", 0, 0, 0 );
-#else
        Debug( LDAP_DEBUG_ANY,
                "bdb_db_open: only one suffix allowed\n", 0, 0, 0 );
-#endif
                return -1;
        }
 #endif
@@ -163,15 +149,9 @@ bdb_db_open( BackendDB *be )
 
        rc = db_env_create( &bdb->bi_dbenv, 0 );
        if( rc != 0 ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( BACK_BDB, ERR, 
-                       "bdb_db_open: db_env_create failed: %s (%d)\n", 
-                       db_strerror(rc), rc, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
                        "bdb_db_open: db_env_create failed: %s (%d)\n",
                        db_strerror(rc), rc, 0 );
-#endif
                return rc;
        }
 
@@ -231,15 +211,9 @@ bdb_db_open( BackendDB *be )
 #endif
                rc = bdb->bi_dbenv->set_tmp_dir( bdb->bi_dbenv, dir );
                if( rc != 0 ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( BACK_BDB, ERR, 
-                               "bdb_db_open: set_tmp_dir(%s) failed: %s (%d)\n", 
-                               dir, db_strerror(rc), rc );
-#else
                        Debug( LDAP_DEBUG_ANY,
                                "bdb_db_open: set_tmp_dir(%s) failed: %s (%d)\n",
                                dir, db_strerror(rc), rc );
-#endif
                        return rc;
                }
 
@@ -249,15 +223,9 @@ bdb_db_open( BackendDB *be )
 #endif
                rc = bdb->bi_dbenv->set_lg_dir( bdb->bi_dbenv, dir );
                if( rc != 0 ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( BACK_BDB, ERR, 
-                               "bdb_db_open: set_lg_dir(%s) failed: %s (%d)\n", 
-                               dir, db_strerror(rc), rc );
-#else
                        Debug( LDAP_DEBUG_ANY,
                                "bdb_db_open: set_lg_dir(%s) failed: %s (%d)\n",
                                dir, db_strerror(rc), rc );
-#endif
                        return rc;
                }
 
@@ -267,28 +235,28 @@ bdb_db_open( BackendDB *be )
 #endif
                rc = bdb->bi_dbenv->set_data_dir( bdb->bi_dbenv, dir );
                if( rc != 0 ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( BACK_BDB, ERR, 
-                               "bdb_db_open: set_data_dir(%s) failed: %s (%d)\n",
-                               dir, db_strerror(rc), rc );
-#else
                        Debug( LDAP_DEBUG_ANY,
                                "bdb_db_open: set_data_dir(%s) failed: %s (%d)\n",
                                dir, db_strerror(rc), rc );
-#endif
                        return rc;
                }
        }
 #endif
 
-#ifdef NEW_LOGGING
-       LDAP_LOG( BACK_BDB, DETAIL1, 
-               "bdb_db_open: dbenv_open %s\n", bdb->bi_dbenv_home, 0, 0 );
-#else
+       if( bdb->bi_dbenv_xflags != 0 ) {
+               rc = bdb->bi_dbenv->set_flags( bdb->bi_dbenv,
+                       bdb->bi_dbenv_xflags, 1);
+               if( rc != 0 ) {
+                       Debug( LDAP_DEBUG_ANY,
+                               "bdb_db_open: dbenv_set_flags failed: %s (%d)\n",
+                               db_strerror(rc), rc, 0 );
+                       return rc;
+               }
+       }
+
        Debug( LDAP_DEBUG_TRACE,
                "bdb_db_open: dbenv_open(%s)\n",
                bdb->bi_dbenv_home, 0, 0);
-#endif
 
 #ifdef HAVE_EBCDIC
        strcpy( path, bdb->bi_dbenv_home );
@@ -304,35 +272,12 @@ bdb_db_open( BackendDB *be )
                bdb->bi_dbenv_mode );
 #endif
        if( rc != 0 ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( BACK_BDB, ERR, 
-                       "bdb_db_open: dbenv_open failed: %s (%d)\n", 
-                       db_strerror(rc), rc, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
                        "bdb_db_open: dbenv_open failed: %s (%d)\n",
                        db_strerror(rc), rc, 0 );
-#endif
                return rc;
        }
 
-       if( bdb->bi_dbenv_xflags != 0 ) {
-               rc = bdb->bi_dbenv->set_flags( bdb->bi_dbenv,
-                       bdb->bi_dbenv_xflags, 1);
-               if( rc != 0 ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( BACK_BDB, ERR, 
-                               "bdb_db_open: dbenv_set_flags failed: %s (%d)\n", 
-                               db_strerror(rc), rc, 0 );
-#else
-                       Debug( LDAP_DEBUG_ANY,
-                               "bdb_db_open: dbenv_set_flags failed: %s (%d)\n",
-                               db_strerror(rc), rc, 0 );
-#endif
-                       return rc;
-               }
-       }
-
        flags = DB_THREAD | bdb->bi_db_opflags;
 
        bdb->bi_databases = (struct bdb_db_info **) ch_malloc(
@@ -346,15 +291,9 @@ bdb_db_open( BackendDB *be )
 
                rc = db_create( &db->bdi_db, bdb->bi_dbenv, 0 );
                if( rc != 0 ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( BACK_BDB, ERR, 
-                               "bdb_db_open: db_create(%s) failed: %s (%d)\n", 
-                               bdb->bi_dbenv_home, db_strerror(rc), rc );
-#else
                        Debug( LDAP_DEBUG_ANY,
                                "bdb_db_open: db_create(%s) failed: %s (%d)\n",
                                bdb->bi_dbenv_home, db_strerror(rc), rc );
-#endif
                        return rc;
                }
 
@@ -413,15 +352,9 @@ bdb_db_open( BackendDB *be )
 #endif
 
                if( rc != 0 ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( BACK_BDB, ERR, 
-                               "bdb_db_open: db_create(%s) failed: %s (%d)\n", 
-                               bdb->bi_dbenv_home, db_strerror(rc), rc );
-#else
                        Debug( LDAP_DEBUG_ANY,
                                "bdb_db_open: db_open(%s) failed: %s (%d)\n",
                                bdb->bi_dbenv_home, db_strerror(rc), rc );
-#endif
                        return rc;
                }
 
@@ -436,15 +369,9 @@ bdb_db_open( BackendDB *be )
        /* get nextid */
        rc = bdb_last_id( be, NULL );
        if( rc != 0 ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( BACK_BDB, ERR, 
-                               "bdb_db_open: last_id(%s) failed: %s (%d)\n", 
-                               bdb->bi_dbenv_home, db_strerror(rc), rc );
-#else
                Debug( LDAP_DEBUG_ANY,
                        "bdb_db_open: last_id(%s) failed: %s (%d)\n",
                        bdb->bi_dbenv_home, db_strerror(rc), rc );
-#endif
                return rc;
        }
 
@@ -509,29 +436,17 @@ bdb_db_destroy( BackendDB *be )
                /* force a checkpoint */
                rc = TXN_CHECKPOINT( bdb->bi_dbenv, 0, 0, DB_FORCE );
                if( rc != 0 ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( BACK_BDB, ERR, 
-                               "bdb_db_destroy: txn_checkpoint failed: %s (%d)\n",
-                               db_strerror(rc), rc, 0 );
-#else
                        Debug( LDAP_DEBUG_ANY,
                                "bdb_db_destroy: txn_checkpoint failed: %s (%d)\n",
                                db_strerror(rc), rc, 0 );
-#endif
                }
 
                rc = bdb->bi_dbenv->close( bdb->bi_dbenv, 0 );
                bdb->bi_dbenv = NULL;
                if( rc != 0 ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( BACK_BDB, ERR, 
-                               "bdb_db_destroy: close failed: %s (%d)\n", 
-                               db_strerror(rc), rc, 0 );
-#else
                        Debug( LDAP_DEBUG_ANY,
                                "bdb_db_destroy: close failed: %s (%d)\n",
                                db_strerror(rc), rc, 0 );
-#endif
                        return rc;
                }
        }
@@ -658,21 +573,16 @@ bdb_initialize(
        };
 
        /* initialize the underlying database system */
-#ifdef NEW_LOGGING
-       LDAP_LOG( BACK_BDB, ENTRY, "bdb_db_initialize\n", 0, 0, 0 );
-#else
-       Debug( LDAP_DEBUG_TRACE, "bdb_initialize: initialize BDB backend\n",
-               0, 0, 0 );
-#endif
+       Debug( LDAP_DEBUG_TRACE,
+               LDAP_XSTRING(bdb_back_initialize) ": initialize " 
+               BDB_UCTYPE " backend\n", 0, 0, 0 );
 
        bi->bi_flags |=
                SLAP_BFLAG_INCREMENT |
 #ifdef BDB_SUBENTRIES
                SLAP_BFLAG_SUBENTRIES |
 #endif
-#ifdef BDB_ALIASES
                SLAP_BFLAG_ALIASES |
-#endif
                SLAP_BFLAG_REFERRALS;
 
        bi->bi_controls = controls;
@@ -696,26 +606,15 @@ bdb_initialize(
                        minor != DB_VERSION_MINOR ||
                        patch < DB_VERSION_PATCH )
                {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( BACK_BDB, ERR, 
-                               "bdb_initialize: BDB library version mismatch:"
-                               " expected " DB_VERSION_STRING ","
-                               " got %s\n", version, 0, 0 );
-#else
                        Debug( LDAP_DEBUG_ANY,
-                               "bdb_initialize: BDB library version mismatch:"
+                               LDAP_XSTRING(bdb_back_initialize) ": "
+                               "BDB library version mismatch:"
                                " expected " DB_VERSION_STRING ","
                                " got %s\n", version, 0, 0 );
-#endif
                }
 
-#ifdef NEW_LOGGING
-               LDAP_LOG( BACK_BDB, DETAIL1, 
-                       "bdb_db_initialize: %s\n", version, 0, 0 );
-#else
-               Debug( LDAP_DEBUG_ANY, "bdb_initialize: %s\n",
-                       version, 0, 0 );
-#endif
+               Debug( LDAP_DEBUG_ANY, LDAP_XSTRING(bdb_back_initialize)
+                       ": %s\n", version, 0, 0 );
        }
 
        db_env_set_func_free( ber_memfree );