aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2007-07-29 02:58:26 +0000
committerDavid Shaw <[email protected]>2007-07-29 02:58:26 +0000
commit43f18c4b653919348a06af814b55e3aa09775087 (patch)
tree6199284725db6785bd4dfc2e38b162d653d8f936
parent* gpgkeys_ldap.c: Fix build warning with mozldap. (diff)
downloadgnupg-43f18c4b653919348a06af814b55e3aa09775087.tar.gz
gnupg-43f18c4b653919348a06af814b55e3aa09775087.zip
* 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.
-rw-r--r--keyserver/ChangeLog6
-rw-r--r--keyserver/gpgkeys_ldap.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 157d74849..2afcdea1f 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-28 David Shaw <[email protected]>
+
+ * 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 <[email protected]>
* gpgkeys_ldap.c: Fix build warning with mozldap.
diff --git a/keyserver/gpgkeys_ldap.c b/keyserver/gpgkeys_ldap.c
index 738666119..560513285 100644
--- a/keyserver/gpgkeys_ldap.c
+++ b/keyserver/gpgkeys_ldap.c
@@ -2188,7 +2188,7 @@ main(int argc,char *argv[])
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