Portability cleanups

diff --git a/servers/slapd/alock.c b/servers/slapd/alock.c
index 83e0fbd37f1f779dd0069f6ac14da19aab333ee0..624e9181851a9e95581cfc27d2a4f345fb3b7312 100644 (file)
--- a/servers/slapd/alock.c
+++ b/servers/slapd/alock.c
@@ -32,7 +32,9 @@
 #include <ac/assert.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#if HAVE_SYS_FILE_H
 #include <sys/file.h>
+#endif
 #include <fcntl.h>
 
 #ifdef _WIN32

diff --git a/servers/slapd/back-ldif/ldif.c b/servers/slapd/back-ldif/ldif.c
index ca1d36bf6389bb5ceeea08d1fdad6db2a61d5453..6e78d87c8b776605b48d4ca89ba43a6aa9e53354 100644 (file)
--- a/servers/slapd/back-ldif/ldif.c
+++ b/servers/slapd/back-ldif/ldif.c
@@ -181,7 +181,7 @@ static int spew_entry(Entry * e, struct berval * path) {
        int entry_length;
        char * entry_as_string;
 
-       openres = open(path->bv_val, O_WRONLY|O_CREAT|O_TRUNC, S_IRUSR | S_IWUSR);
+       openres = open(path->bv_val, O_WRONLY|O_CREAT|O_TRUNC, S_IREAD | S_IWRITE);
        if(openres == -1) {
                if(errno == ENOENT)
                        rs = LDAP_NO_SUCH_OBJECT;

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index dbc62367e15e59e385484fc19affbd80d19ddadd..1b612e8aab48b8a01c0e21ac830d43001007535b 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -36,7 +36,14 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+
+#ifndef S_ISREG
+#define        S_ISREG(m)      (((m) & _S_IFMT) == _S_IFREG)
+#endif
+
+#if HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 
 #include "slap.h"
 #ifdef LDAP_SLAPI

diff --git a/servers/slapd/overlays/retcode.c b/servers/slapd/overlays/retcode.c
index 81b0ae275d05ca0741be50449970fd9aabacacbe..3e5568552d255293069a853f594afeb010a7e4f6 100644 (file)
--- a/servers/slapd/overlays/retcode.c
+++ b/servers/slapd/overlays/retcode.c
@@ -93,20 +93,22 @@ retcode_entry_response( Operation *op, SlapReply *rs, BackendInfo *bi, Entry *e
 static unsigned int
 retcode_sleep( int s )
 {
+       unsigned int r = 0;
+
        /* sleep as required */
        if ( s < 0 ) {
 #if 0  /* use high-order bits for better randomness (Numerical Recipes in "C") */
-               unsigned        r = rand() % (-s);
+               r = rand() % (-s);
 #endif
-               unsigned        r = ((double)(-s))*rand()/(RAND_MAX + 1.0);
-               return sleep( r );
+               r = ((double)(-s))*rand()/(RAND_MAX + 1.0);
+       } else if ( s > 0 ) {
+               r = (unsigned int)s;
        }
-
-       if ( s > 0 ) {
-               return sleep( (unsigned int)s );
+       if ( r ) {
+               sleep( r );
        }
 
-       return 0;
+       return r;
 }
 
 static int

diff --git a/servers/slapd/slapcommon.c b/servers/slapd/slapcommon.c
index 7ba89edb5c19560b74da374aa1f095aafde48513..bad640605a6485b68b45b4d3e26b2aae5653a0f0 100644 (file)
--- a/servers/slapd/slapcommon.c
+++ b/servers/slapd/slapcommon.c
@@ -517,6 +517,7 @@ slap_tool_init(
                        exit( EXIT_FAILURE );
        }
 
+#ifdef LDAP_SYSLOG
        if ( syslog_unknowns ) {
                rc = parse_debug_unknowns( syslog_unknowns, &ldap_syslog );
                ldap_charray_free( syslog_unknowns );
@@ -524,6 +525,7 @@ slap_tool_init(
                if ( rc )
                        exit( EXIT_FAILURE );
        }
+#endif
 
        at_oc_cache = 1;
 

diff --git a/servers/slapd/slaptest.c b/servers/slapd/slaptest.c
index a1c6baba0f7b43ce7dac97ab215916ead8536f96..6ad27ba7f0836e3972f728e55b8e6e2f212c9fdf 100644 (file)
--- a/servers/slapd/slaptest.c
+++ b/servers/slapd/slaptest.c
@@ -45,7 +45,7 @@ test_file( const char *fname, const char *ftype )
 
        switch ( stat( fname, &st ) ) {
        case 0:
-               if ( !( st.st_mode & S_IWUSR ) ) {
+               if ( !( st.st_mode & S_IWRITE ) ) {
                        Debug( LDAP_DEBUG_ANY, "%s file "
                                "\"%s\" exists, but user does not have access\n",
                                ftype, fname, 0 );