Fix Debian bug #463322: Use deprecated libldap API

| Our automated build log filter[1] detected a problem that is likely to
| cause your package to segfault on architectures where the size of a
| pointer is greater than the size of an integer, such as ia64 and
| amd64.
|
| This is often due to a missing function prototype definition.  For
| more information, see [2].
|
| 	Function `ldap_init' implicitly converted to pointer at
| 	check_ldap.c:124
|
| [1] http://people.debian.org/~dannf/check-implicit-pointer-functions
| [2] http://wiki.debian.org/ImplicitPointerConversions
|
| The libldap API has been updated and many functions used by the ldap
| plugin are now deprecated.  This package should either update to the
| new API or define LDAP_DEPRECATED to continue using the deprecated
| interfaces.
|
| This patch implements the lazy solution.

[ http://bugs.debian.org/463322 ]

(Contributed by Dann Frazier, forwarded by Jan Wagner.)

diff --git a/THANKS.in b/THANKS.in
index ee75f33a006fd88475ebfae091a5e4e65458c111..cc6e1941a656383d46c329d0e39877d8a412e140 100644 (file)
--- a/THANKS.in
+++ b/THANKS.in
@@ -261,3 +261,4 @@ Bryan Irvine
 Jimmy Bergman
 Konstantin Khomoutov
 Josip Rodin
+Dann Frazier

diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index 25432de12f9e35b6b8379e97f8150d3b74075eda..492839468130b1fa54f7a093bcbdc8ef5b40a6f0 100644 (file)
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -36,6 +36,7 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net";
 #include "utils.h"
 
 #include <lber.h>
+#define LDAP_DEPRECATED 1
 #include <ldap.h>
 
 enum {