more cleanup from jon@symas.com

diff --git a/clients/ud/edit.c b/clients/ud/edit.c
index ebef1f2084e79f1937c2b39cbfe5e124f279bfad..d115562a880fbbede484d9abf9025db79426e4d3 100644 (file)
--- a/clients/ud/edit.c
+++ b/clients/ud/edit.c
@@ -47,7 +47,7 @@
 #endif
 
 #include <ldap.h>
-
+#include "lutil.h"
 #include "ldap_defaults.h"
 #include "ud.h"
 

diff --git a/libraries/liblutil/utils.c b/libraries/liblutil/utils.c
index 089328aab493b6eaef6c4627dd237a987f7c9cea..7061a96c8f4bf177a0c302450efd694b36a04ded 100644 (file)
--- a/libraries/liblutil/utils.c
+++ b/libraries/liblutil/utils.c
@@ -9,6 +9,9 @@
 #include <ac/stdlib.h>
 #include <ac/string.h>
 #include <ac/unistd.h>
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif

diff --git a/servers/slapd/back-bdb/id2entry.c b/servers/slapd/back-bdb/id2entry.c
index 4bd67d135ad48ae067a8178021f72565ad61b06c..df88abadc97ede25c67142d2bfa6942bd3ca1834 100644 (file)
--- a/servers/slapd/back-bdb/id2entry.c
+++ b/servers/slapd/back-bdb/id2entry.c
@@ -170,8 +170,12 @@ int bdb_entry_release(
        Entry *e,
        int rw )
 {
+       int retval = 0;
+
        if (o && o->o_tag == LDAP_REQ_ADD)
                entry_free(e);
        else
-               return bdb_entry_return( be, e );
+               retval = bdb_entry_return( be, e );
+
+       return retval;
 }

diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index 4c625435aac47f197d5a6e925e1ad19171a82848..53e4373c1d293caa9178602fcdcf89eaa1ac4f7f 100644 (file)
--- a/servers/slapd/back-bdb/init.c
+++ b/servers/slapd/back-bdb/init.c
@@ -9,6 +9,8 @@
 
 #include <stdio.h>
 #include <ac/string.h>
+#include <ac/unistd.h>
+#include <ac/stdlib.h>
 
 #include "back-bdb.h"
 #include "external.h"

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 4da7ccd11e31ca6d2402b65409a454a26d61c610..c383e90a22277a22699326958dda2b947867f190 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -365,7 +365,7 @@ long connection_init(
 
 #else
        {
-               unsigned int i;
+               ber_socket_t    i;
 
                c = NULL;