[svn] GnuPG - r4552 - branches/STABLE-BRANCH-1-4/keyserver

[svn author dshaw]

Author: dshaw
Date: 2007-07-27 18:33:05 +0200 (Fri, 27 Jul 2007)
New Revision: 4552

Modified:
   branches/STABLE-BRANCH-1-4/keyserver/ChangeLog
   branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_ldap.c
Log:
* gpgkeys_ldap.c: Fix build warning with mozldap.


Modified: branches/STABLE-BRANCH-1-4/keyserver/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/keyserver/ChangeLog	2007-07-27 16:21:18 UTC (rev 4551)
+++ branches/STABLE-BRANCH-1-4/keyserver/ChangeLog	2007-07-27 16:33:05 UTC (rev 4552)
@@ -1,5 +1,7 @@
 2007-07-27  David Shaw  <dshaw at jabberwocky.com>
 
+	* gpgkeys_ldap.c: Fix build warning with mozldap.
+
 	* gpgkeys_ldap.c (search_key, main): Fix bug where searching for
 	foo bar (no quotes) on the command line resulted in searching for
 	"foo\2Abar" due to LDAP quoting.  The proper search is "foo*bar".

Modified: branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_ldap.c
===================================================================
--- branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_ldap.c	2007-07-27 16:21:18 UTC (rev 4551)
+++ branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_ldap.c	2007-07-27 16:33:05 UTC (rev 4552)
@@ -55,6 +55,11 @@
 #include <ldap.h>
 #endif
 
+/* For mozldap */
+#ifdef HAVE_LDAP_SSL_H
+#include <ldap_ssl.h>
+#endif
+
 #include "compat.h"
 #include "keyserver.h"
 #include "ksutil.h"