mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-01-06 10:46:21 +08:00
ITS#3660 fix BDB verbose calls
This commit is contained in:
parent
3189027df7
commit
41d37a335e
@ -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 );
|
||||
}
|
||||
|
||||
#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
|
||||
|
||||
#undef db_strerror
|
||||
|
@ -115,7 +115,11 @@ bdb_do_recovery( BackendDB *be )
|
||||
re_dbenv->set_errpfx( re_dbenv, be->be_suffix[0].bv_val );
|
||||
re_dbenv->set_errcall( re_dbenv, bdb_errcall );
|
||||
(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);
|
||||
#else
|
||||
re_dbenv->set_msgcall( re_dbenv, bdb_msgcall );
|
||||
#endif
|
||||
|
||||
flags = DB_CREATE | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL |
|
||||
DB_INIT_TXN | DB_USE_ENVIRON | DB_RECOVER;
|
||||
|
@ -146,7 +146,9 @@ int bdb_fix_dn( Entry *e, int checkit );
|
||||
#if DB_VERSION_FULL < 0x04030000
|
||||
void bdb_errcall( const char *pfx, char * msg );
|
||||
#else
|
||||
#define bdb_msgcall BDB_SYMBOL(msgcall)
|
||||
void bdb_errcall( const DB_ENV *env, const char *pfx, const char * msg );
|
||||
void bdb_msgcall( const DB_ENV *env, const char * msg );
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_EBCDIC
|
||||
|
Loading…
Reference in New Issue
Block a user