[svn] GnuPG - r4081 - trunk/keyserver

[svn author dshaw]

Author: dshaw
Date: 2006-03-27 21:06:46 +0200 (Mon, 27 Mar 2006)
New Revision: 4081

Modified:
   trunk/keyserver/ChangeLog
   trunk/keyserver/gpgkeys_ldap.c
Log:
* gpgkeys_ldap.c: #define LDAP_DEPRECATED for newer OpenLDAPs so they use
the regular old API that is compatible with other LDAP libraries.


Modified: trunk/keyserver/ChangeLog
===================================================================
--- trunk/keyserver/ChangeLog	2006-03-25 03:05:30 UTC (rev 4080)
+++ trunk/keyserver/ChangeLog	2006-03-27 19:06:46 UTC (rev 4081)
@@ -1,3 +1,9 @@
+2006-03-27  David Shaw  <dshaw at jabberwocky.com>
+
+	* 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  <dshaw at jabberwocky.com>
 
 	* gpgkeys_ldap.c (main): Fix build problem with non-OpenLDAP LDAP

Modified: trunk/keyserver/gpgkeys_ldap.c
===================================================================
--- trunk/keyserver/gpgkeys_ldap.c	2006-03-25 03:05:30 UTC (rev 4080)
+++ trunk/keyserver/gpgkeys_ldap.c	2006-03-27 19:06:46 UTC (rev 4081)
@@ -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