From 8719bd099ddcab78a31aab6cc72cc37e4b783af1 Mon Sep 17 00:00:00 2001
From: jkar8572 <jkar8572>
Date: Thu, 23 Aug 2007 14:05:49 +0000
Subject: Fixed compilation with older ldap library (Jan Kara)

---
 Changelog    | 1 +
 configure.in | 1 +
 warnquota.c  | 6 +++---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Changelog b/Changelog
index aa6837a..21d947e 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 Changes in quota-tools from 3.15 to 3.16
+* fixed compilation with openLDAP library versions 2.1 and 2.2 (Jan Kara)
 * always define allow_severity and deny_severity for older versions of libwrap (Martin Jacobs)
 * cleaned up host_access() handling (Jan Kara)
 * configure script now correctly reports checking of libwrap (Jan Kara)
diff --git a/configure.in b/configure.in
index 57426dc..15087b7 100644
--- a/configure.in
+++ b/configure.in
@@ -34,6 +34,7 @@ if test "x$enable_ldapmail" != "xno"; then
 		CFLAGS="$CFLAGS -DUSE_LDAP_MAIL_LOOKUP"
 		if test "x$have_new_ldap" = "xyes"; then
 			CFLAGS="$CFLAGS -DUSE_LDAP_23"
+			AC_CHECK_DECL(ldap_perror, , CFLAGS="$CFLAGS -DNEED_LDAP_PERROR", ldap.h)
 		fi
 	else
 		if test "x$enable_ldapmail" = "xyes"; then
diff --git a/warnquota.c b/warnquota.c
index 1456da7..f8188ad 100644
--- a/warnquota.c
+++ b/warnquota.c
@@ -10,7 +10,7 @@
  * 
  * Author:  Marco van Wieringen <mvw@planets.elm.net>
  *
- * Version: $Id: warnquota.c,v 1.29 2007/08/22 13:03:24 jkar8572 Exp $
+ * Version: $Id: warnquota.c,v 1.30 2007/08/23 14:05:49 jkar8572 Exp $
  *
  *          This program is free software; you can redistribute it and/or
  *          modify it under the terms of the GNU General Public License as
@@ -172,8 +172,8 @@ static void wc_exit(int ex_stat)
 }
 
 #ifdef USE_LDAP_MAIL_LOOKUP
-#ifdef USE_LDAP_23
-void ldap_perror(LDAP *ld, char *s)
+#ifdef NEED_LDAP_PERROR
+static void ldap_perror(LDAP *ld, LDAP_CONST char *s)
 {
 	int err;
 
-- 
cgit v1.2.3