diff options
| author | Phil Pennock <pdp@exim.org> | 2011-03-22 06:43:34 -0400 |
|---|---|---|
| committer | Phil Pennock <pdp@exim.org> | 2011-03-22 06:43:34 -0400 |
| commit | 109066729a54f6ba5c4e8bc174133da33242e930 (patch) | |
| tree | 594f1ce03368d58d8c87a0aba1322c5606986e66 | |
| parent | b3c261f710276f28ea23bf86dddacdf5fb4612b4 (diff) | |
Make ldap_require_cert work (not segfault).
The clang complaint, which also triggered a gcc complaint, was
legitimate. My first test, which suggested no problem, was flawed.
This:
ldap_start_tls
ldap_require_cert = demand
would cause a segfault on LDAP lookup.
fixes bug 230
| -rw-r--r-- | doc/doc-txt/ChangeLog | 6 | ||||
| -rw-r--r-- | src/src/lookups/ldap.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 853f3a573..94952afa5 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -3,6 +3,12 @@ $Cambridge: exim/doc/doc-txt/ChangeLog,v 1.632 2010/06/12 15:21:25 jetmore Exp $ Change log file for Exim from version 4.21 ------------------------------------------- +Exim version 4.76 +----------------- + +PP/01 The new ldap_require_cert option would segfault if used. Fixed. + + Exim version 4.75 ----------------- diff --git a/src/src/lookups/ldap.c b/src/src/lookups/ldap.c index ddf803e21..06b749469 100644 --- a/src/src/lookups/ldap.c +++ b/src/src/lookups/ldap.c @@ -481,7 +481,7 @@ if (lcp == NULL) { cert_option = LDAP_OPT_X_TLS_TRY; } - ldap_set_option(ld, LDAP_OPT_X_TLS_REQUIRE_CERT, cert_option); + ldap_set_option(ld, LDAP_OPT_X_TLS_REQUIRE_CERT, &cert_option); } #endif |