upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-23 16:19:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#3660 fix BDB verbose calls

Browse source
This commit is contained in:
Howard Chu 2005-04-16 01:24:00 +00:00
parent 3189027df7
commit 41d37a335e
3 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
servers/slapd/back-bdb/error.c
View file

@ -35,6 +35,17 @@ void bdb_errcall( const DB_ENV *env, const char *pfx, const char * msg )
Debug( LDAP_DEBUG_ANY, "bdb(%s): %s\n", pfx, msg, 0 ); Debug( LDAP_DEBUG_ANY, "bdb(%s): %s\n", pfx, msg, 0 );
} }
#if DB_VERSION_FULL >= 0x04030000
void bdb_msgcall( const DB_ENV *env, const char *msg )
{
#ifdef HAVE_EBCDIC
if ( msg[0] > 0x7f )
__etoa( msg );
#endif
Debug( LDAP_DEBUG_TRACE, "bdb: %s\n", msg, 0, 0 );
}
#endif
#ifdef HAVE_EBCDIC #ifdef HAVE_EBCDIC
#undef db_strerror #undef db_strerror

4
servers/slapd/back-bdb/init.c
View file

@ -115,7 +115,11 @@ bdb_do_recovery( BackendDB *be )
re_dbenv->set_errpfx( re_dbenv, be->be_suffix[0].bv_val ); re_dbenv->set_errpfx( re_dbenv, be->be_suffix[0].bv_val );
re_dbenv->set_errcall( re_dbenv, bdb_errcall ); re_dbenv->set_errcall( re_dbenv, bdb_errcall );
(void)re_dbenv->set_verbose(re_dbenv, DB_VERB_RECOVERY, 1); (void)re_dbenv->set_verbose(re_dbenv, DB_VERB_RECOVERY, 1);
#if DB_VERSION_FULL < 0x04030000
(void)re_dbenv->set_verbose(re_dbenv, DB_VERB_CHKPOINT, 1); (void)re_dbenv->set_verbose(re_dbenv, DB_VERB_CHKPOINT, 1);
#else
re_dbenv->set_msgcall( re_dbenv, bdb_msgcall );
#endif
flags = DB_CREATE | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | flags = DB_CREATE | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL |
DB_INIT_TXN | DB_USE_ENVIRON | DB_RECOVER; DB_INIT_TXN | DB_USE_ENVIRON | DB_RECOVER;

2
servers/slapd/back-bdb/proto-bdb.h
View file

@ -146,7 +146,9 @@ int bdb_fix_dn( Entry *e, int checkit );
#if DB_VERSION_FULL < 0x04030000 #if DB_VERSION_FULL < 0x04030000
void bdb_errcall( const char *pfx, char * msg ); void bdb_errcall( const char *pfx, char * msg );
#else #else
#define bdb_msgcall BDB_SYMBOL(msgcall)
void bdb_errcall( const DB_ENV *env, const char *pfx, const char * msg ); void bdb_errcall( const DB_ENV *env, const char *pfx, const char * msg );
void bdb_msgcall( const DB_ENV *env, const char * msg );
#endif #endif
#ifdef HAVE_EBCDIC #ifdef HAVE_EBCDIC