From 739128a0165d795a1c6110696768614efcfefe50 Mon Sep 17 00:00:00 2001
From: Pierangelo Masarati <ando@openldap.org>
Date: Mon, 25 Jul 2005 20:50:33 +0000
Subject: [PATCH] silence warning(s)

---
 configure.in                   | 17 +++++++++--------
 servers/slapd/back-bdb/init.c  |  3 +++
 servers/slapd/back-bdb/tools.c |  2 ++
 servers/slapd/overlays/glue.c  |  1 -
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/configure.in b/configure.in
index eb1f52fb7c..156cefb3ca 100644
--- a/configure.in
+++ b/configure.in
@@ -774,11 +774,11 @@ if test $am_cv_sys_posix_termios = yes ; then
 		[define if you have POSIX termios])
 fi
 
-AC_CHECK_HEADERS(	\
+AC_CHECK_HEADERS(		\
 	arpa/inet.h		\
-	arpa/nameser.h	\
+	arpa/nameser.h		\
 	assert.h		\
-	bits/types.h	\
+	bits/types.h		\
 	conio.h			\
 	crypt.h			\
 	direct.h		\
@@ -791,7 +791,7 @@ AC_CHECK_HEADERS(	\
 	libutil.h		\
 	limits.h		\
 	locale.h		\
-	netinet/tcp.h	\
+	netinet/tcp.h		\
 	malloc.h		\
 	memory.h		\
 	psap.h			\
@@ -809,11 +809,11 @@ AC_CHECK_HEADERS(	\
 	sys/errno.h		\
 	sys/ioctl.h		\
 	sys/param.h		\
-	sys/resource.h	\
-	sys/select.h	\
-	sys/socket.h	\
+	sys/resource.h		\
+	sys/select.h		\
+	sys/socket.h		\
 	sys/stat.h		\
-	sys/syslog.h	\
+	sys/syslog.h		\
 	sys/time.h		\
 	sys/types.h		\
 	sys/ucred.h		\
@@ -821,6 +821,7 @@ AC_CHECK_HEADERS(	\
 	syslog.h		\
 	termios.h		\
 	unistd.h		\
+	utime.h			\
 	winsock.h		\
 	winsock2.h		\
 )
diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index 99f6f33eaa..666e43c03d 100644
--- a/servers/slapd/back-bdb/init.c
+++ b/servers/slapd/back-bdb/init.c
@@ -22,6 +22,9 @@
 #include <ac/stdlib.h>
 #include <ac/errno.h>
 #include <sys/stat.h>
+#ifdef HAVE_UTIME_H
+#include <utime.h>
+#endif /* HAVE_UTIME_H */
 #include "back-bdb.h"
 #include <lutil.h>
 #include <ldap_rq.h>
diff --git a/servers/slapd/back-bdb/tools.c b/servers/slapd/back-bdb/tools.c
index 73d26a251a..bafba3549e 100644
--- a/servers/slapd/back-bdb/tools.c
+++ b/servers/slapd/back-bdb/tools.c
@@ -185,7 +185,9 @@ Entry* bdb_tool_entry_get( BackendDB *be, ID id )
 {
 	int rc;
 	Entry *e = NULL;
+#ifndef BDB_HIER
 	struct berval bv;
+#endif
 
 	assert( be != NULL );
 	assert( slapMode & SLAP_TOOL_MODE );
diff --git a/servers/slapd/overlays/glue.c b/servers/slapd/overlays/glue.c
index 125af28328..a832597f16 100644
--- a/servers/slapd/overlays/glue.c
+++ b/servers/slapd/overlays/glue.c
@@ -516,7 +516,6 @@ glue_close (
 	BackendInfo *bi
 )
 {
-	slap_overinst *on = glue_tool_inst( bi );
 	static int glueClosed = 0;
 	int rc = 0;
 
-- 
2.39.5