From 773b3aff16b24754e84d0deca59c84e0ed0752f4 Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@openldap.org>
Date: Tue, 18 Dec 2001 04:52:55 +0000
Subject: [PATCH] more cleanup from jon@symas.com

---
 clients/ud/edit.c                 | 2 +-
 libraries/liblutil/utils.c        | 3 +++
 servers/slapd/back-bdb/id2entry.c | 6 +++++-
 servers/slapd/back-bdb/init.c     | 2 ++
 servers/slapd/connection.c        | 2 +-
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/clients/ud/edit.c b/clients/ud/edit.c
index ebef1f2084..d115562a88 100644
--- 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 089328aab4..7061a96c8f 100644
--- 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 4bd67d135a..df88abadc9 100644
--- 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 4c625435aa..53e4373c1d 100644
--- 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 4da7ccd11e..c383e90a22 100644
--- 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;
 
-- 
2.39.5