[svn] dirmngr - r283 - trunk/src

[svn author wk]

Author: wk
Date: 2008-02-01 12:26:55 +0100 (Fri, 01 Feb 2008)
New Revision: 283

Modified:
   trunk/src/ChangeLog
   trunk/src/dirmngr_ldap.c
   trunk/src/ldap.c
Log:
Compatibility fix for newer OpenLDAP versions.
Fixed Debian#463358.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2008-01-31 19:58:23 UTC (rev 282)
+++ trunk/src/ChangeLog	2008-02-01 11:26:55 UTC (rev 283)
@@ -1,3 +1,10 @@
+2008-02-01  Werner Koch  <wk at g10code.com>
+
+	* ldap.c: Remove all ldap headers as they are unused.
+
+	* dirmngr_ldap.c (LDAP_DEPRECATED): New, to have OpenLDAP use the
+	old standard API.
+
 2008-01-10  Werner Koch  <wk at g10code.com>
 
 	* dirmngr-client.c: New option --local.

Modified: trunk/src/dirmngr_ldap.c
===================================================================
--- trunk/src/dirmngr_ldap.c	2008-01-31 19:58:23 UTC (rev 282)
+++ trunk/src/dirmngr_ldap.c	2008-02-01 11:26:55 UTC (rev 283)
@@ -36,6 +36,8 @@
 #include <winldap.h>
 #include "ldap-url.h"
 #else
+/* For OpenLDAP, to enable the API that we're using. */
+#define LDAP_DEPRECATED 1
 #include <ldap.h>
 #endif
 

Modified: trunk/src/ldap.c
===================================================================
--- trunk/src/ldap.c	2008-01-31 19:58:23 UTC (rev 282)
+++ trunk/src/ldap.c	2008-02-01 11:26:55 UTC (rev 283)
@@ -28,12 +28,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <time.h>
-#ifdef HAVE_W32_SYSTEM
-#include <winsock2.h>
-#include <winldap.h>
-#else
-#include <ldap.h> /* fixme: remove it */
-#endif
 #include <pth.h>
 #include <ksba.h>