aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--keyserver/ChangeLog6
-rw-r--r--keyserver/gpgkeys_ldap.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 795b7d45e..1c3dc663b 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-27 David Shaw <[email protected]>
+
+ * gpgkeys_ldap.c: #define LDAP_DEPRECATED for newer OpenLDAPs so
+ they use the regular old API that is compatible with other LDAP
+ libraries.
+
2006-03-03 David Shaw <[email protected]>
* gpgkeys_ldap.c (main): Fix build problem with non-OpenLDAP LDAP
diff --git a/keyserver/gpgkeys_ldap.c b/keyserver/gpgkeys_ldap.c
index 85654fb5b..c47831907 100644
--- a/keyserver/gpgkeys_ldap.c
+++ b/keyserver/gpgkeys_ldap.c
@@ -37,6 +37,8 @@
#ifdef NEED_LBER_H
#include <lber.h>
#endif
+/* For OpenLDAP, to enable the API that we're using. */
+#define LDAP_DEPRECATED 1
#include <ldap.h>
#endif