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

[svn author dshaw]

Author: dshaw
Date: 2007-07-29 04:58:26 +0200 (Sun, 29 Jul 2007)
New Revision: 4553

Modified:
   branches/STABLE-BRANCH-1-4/keyserver/ChangeLog
   branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_ldap.c
Log:
* gpgkeys_ldap.c (main): Fix bug in setting up whether to verify peer
SSL cert.  This used to work with older OpenLDAP, but is now more
strictly handled.


Modified: branches/STABLE-BRANCH-1-4/keyserver/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/keyserver/ChangeLog	2007-07-27 16:33:05 UTC (rev 4552)
+++ branches/STABLE-BRANCH-1-4/keyserver/ChangeLog	2007-07-29 02:58:26 UTC (rev 4553)
@@ -1,3 +1,9 @@
+2007-07-28  David Shaw  <dshaw at jabberwocky.com>
+
+	* gpgkeys_ldap.c (main): Fix bug in setting up whether to verify
+	peer SSL cert.  This used to work with older OpenLDAP, but is now
+	more strictly handled.
+
 2007-07-27  David Shaw  <dshaw at jabberwocky.com>
 
 	* gpgkeys_ldap.c: Fix build warning with mozldap.

Modified: branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_ldap.c
===================================================================
--- branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_ldap.c	2007-07-27 16:33:05 UTC (rev 4552)
+++ branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_ldap.c	2007-07-29 02:58:26 UTC (rev 4553)
@@ -2188,7 +2188,7 @@
 	      else
 		ver=LDAP_OPT_X_TLS_NEVER;
 
-	      err=ldap_set_option(ldap,LDAP_OPT_X_TLS_REQUIRE_CERT,&ver);
+	      err=ldap_set_option(NULL,LDAP_OPT_X_TLS_REQUIRE_CERT,&ver);
 	    }
 #endif