Fix -USLAPD_RLOOKUPS

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

diff --git a/servers/slapd/back-ldbm/startup.c b/servers/slapd/back-ldbm/startup.c
index d44410cb24274ecc899bebf15f32b91d8089a017..c9e8703d1f2f9162920c38354322791eb7d49264 100644 (file)
--- a/servers/slapd/back-ldbm/startup.c
+++ b/servers/slapd/back-ldbm/startup.c
@@ -8,11 +8,15 @@
 #include <ac/string.h>
 #include <ac/socket.h>
 
-#include "ldapconfig.h"
+#include "ldap_defaults.h"
 #include "slap.h"
 #include "back-ldbm.h"
 
-#include "db.h"
+#ifdef HAVE_DB1_DB_H
+#      include <db1/db.h>
+#else
+#      include <db.h>
+#endif
 
 #ifdef HAVE_BERKELEY_DB2
 
@@ -47,11 +51,11 @@ ldbm_back_startup(
 
        /*  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 = strdup( cwd );