Minor adjustments to better handle NT vs UNIX.

diff --git a/include/ldapconfig.h.edit b/include/ldapconfig.h.edit
index e99dbac0748f088a584d5e18d660926c081af44b..687e9075f666e3bfa385614ecd7a2376684edbd8 100644 (file)
--- a/include/ldapconfig.h.edit
+++ b/include/ldapconfig.h.edit
@@ -31,7 +31,6 @@
  * SHARED DEFINITIONS
  * These are shared with Makefile and should not change via configure
  */
-#define DEFAULT_DIRSEP         "/"
 #define DEFAULT_BINDIR         "%BINDIR%"
 #define DEFAULT_SBINDIR                "%SBINDIR%"
 #define DEFAULT_DATADIR                "%DATADIR%"

diff --git a/include/ldapconfig.h.nt b/include/ldapconfig.h.nt
index 4590031ed0e198f598935a82fe46488ae461c79f..5b21bea2b0b94959e8222c11767cb49dd3d5736d 100644 (file)
--- a/include/ldapconfig.h.nt
+++ b/include/ldapconfig.h.nt
@@ -31,7 +31,6 @@
 /*
  * SHARED DEFINITIONS - things you should change
  */
-#define DEFAULT_DIRSEP         "\\"
 #define DEFAULT_BINDIR         "C:\\OpenLDAP\\bin"
 #define DEFAULT_SBINDIR                "C:\\OpenLDAP\\sbin"
 #define DEFAULT_DATADIR                "C:\\OpenLDAP\\share"

diff --git a/include/portable.h.nt b/include/portable.h.nt
index 89f488c59a52cfebe49a23a593d61f9bf15dd78e..91dc84702233acd25cc8c4a8c25888e484e11317 100644 (file)
--- a/include/portable.h.nt
+++ b/include/portable.h.nt
@@ -21,6 +21,7 @@
 #define OPENLDAP_PACKAGE "OpenLDAP"
 #define OPENLDAP_VERSION "-devel"
 #define EXEEXT ".exe"
+#define DIRSEP "\\"
 
 #if defined( _DEBUG ) && !defined( LDAP_DEBUG )
 #define LDAP_DEBUG 1

diff --git a/libraries/liblber/memory.c b/libraries/liblber/memory.c
index ee5f4e8edea2fb967d8a312d92b7f18d254c0817..f893cfab7c9755f02866b260f4968d2f21fc19fc 100644 (file)
--- a/libraries/liblber/memory.c
+++ b/libraries/liblber/memory.c
@@ -5,6 +5,7 @@
 #include "portable.h"
 
 #include <stdlib.h>
+#include <ac/string.h>
 
 #include "lber-int.h"
 

diff --git a/servers/slapd/back-ldbm/dbcache.c b/servers/slapd/back-ldbm/dbcache.c
index 3da8ed422649322b2c875edc12ec2497c20f6074..b624ef55a3e38a36328cbf0139bcd332e27726a3 100644 (file)
--- a/servers/slapd/back-ldbm/dbcache.c
+++ b/servers/slapd/back-ldbm/dbcache.c
@@ -35,7 +35,7 @@ ldbm_cache_open(
        struct stat     st;
 #endif
 
-       sprintf( buf, "%s%s%s%s", li->li_directory, DEFAULT_DIRSEP, name, suffix );
+       sprintf( buf, "%s%s%s%s", li->li_directory, DIRSEP, name, suffix );
 
        Debug( LDAP_DEBUG_TRACE, "=> ldbm_cache_open( \"%s\", %d, %o )\n", buf,
            flags, li->li_mode );

diff --git a/servers/slapd/back-ldbm/startup.c b/servers/slapd/back-ldbm/startup.c
index 8c2e0033cc23e744e9be2bf142211242ac74573d..972ea04725414e8ba335ce642403abccf88e3d3b 100644 (file)
--- a/servers/slapd/back-ldbm/startup.c
+++ b/servers/slapd/back-ldbm/startup.c
@@ -51,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 != *DIRSEP ) {
                char   cwd[MAXPATHLEN];
 
                (void) getcwd( cwd, MAXPATHLEN );
-               sprintf( cwd, "%s%s%s", cwd, DEFAULT_DIRSEP, li->li_directory );
+               sprintf( cwd, "%s%s%s", cwd, DIRSEP, li->li_directory );
                free( li->li_directory );
                li->li_directory = strdup( cwd );
 

diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index 25056be2d0a8d31cac0c654a4dfce38afb9bbd62..a200bd2fddfbb26e6865c20c49ec54f9119e3876 100644 (file)
--- a/servers/slapd/schema.c
+++ b/servers/slapd/schema.c
@@ -66,7 +66,7 @@ oc_check_required( Entry *e, char *ocname )
 {
        ObjectClass     *oc;
        AttributeType   *at;
-       int             i, j;
+       int             i;
        Attribute       *a;
        char            **pp;