#include <ac/socket.h>
#include <ac/unistd.h>
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
#ifdef HAVE_DIRECT_H
#include <direct.h>
#endif
-#include "ldapconfig.h"
+#include "ldap_defaults.h"
#include "slap.h"
#include "back-bdb2.h"
static void
-bdb2i_db_errcall( char *prefix, char *message )
+bdb2i_db_errcall( const char *prefix, char *message )
{
Debug( LDAP_DEBUG_ANY, "bdb2_db_errcall(): %s %s", prefix, message, 0 );
}
DB_INIT_LOCK | DB_INIT_MPOOL );
/* make sure, dbhome is an absolute path */
- if ( *lty->lty_dbhome != *DEFAULT_DIRSEP ) {
+ if ( *lty->lty_dbhome != *LDAP_DIRSEP ) {
char cwd[MAXPATHLEN];
(void) getcwd( cwd, MAXPATHLEN );
- sprintf( cwd, "%s%s%s", cwd, DEFAULT_DIRSEP, lty->lty_dbhome );
+ sprintf( cwd, "%s" LDAP_DIRSEP "%s",
+ cwd, lty->lty_dbhome );
free( lty->lty_dbhome );
lty->lty_dbhome = ch_strdup( cwd );
/* if the data directory is not an absolute path, have it relative
to the current working directory (which should not be configured !) */
- if ( *li->li_directory != *DEFAULT_DIRSEP ) {
+ if ( *li->li_directory != *LDAP_DIRSEP ) {
char cwd[MAXPATHLEN];
(void) getcwd( cwd, MAXPATHLEN );
- sprintf( cwd, "%s%s%s", cwd, DEFAULT_DIRSEP, li->li_directory );
+ sprintf( cwd, "%s" LDAP_DIRSEP "%s",
+ cwd, li->li_directory );
+
free( li->li_directory );
li->li_directory = ch_strdup( cwd );
int err;
memset( &dbEnv, 0, sizeof( DB_ENV ));
- dbEnv.db_errcall = stderr;
+ dbEnv.db_errcall = bdb2i_db_errcall;
dbEnv.db_errpfx = "remove_old_locks(): db_appinit:";
dbEnv.lk_max = 0;