diff options
Diffstat (limited to 'lib/eldap')
| -rw-r--r-- | lib/eldap/doc/src/notes.xml | 34 | ||||
| -rw-r--r-- | lib/eldap/test/eldap_basic_SUITE.erl | 17 | ||||
| -rw-r--r-- | lib/eldap/vsn.mk | 2 |
3 files changed, 47 insertions, 6 deletions
diff --git a/lib/eldap/doc/src/notes.xml b/lib/eldap/doc/src/notes.xml index c21717a47a..e7a3e20202 100644 --- a/lib/eldap/doc/src/notes.xml +++ b/lib/eldap/doc/src/notes.xml @@ -30,7 +30,39 @@ </header> <p>This document describes the changes made to the Eldap application.</p> - <section><title>Eldap 1.0.1</title> + <section><title>Eldap 1.0.2</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Removed {verify,0} from ssl-options because eldap does + not support peer verification. Thanks to Florian Waas for + reporting.</p> + <p> + Own Id: OTP-11354</p> + </item> + </list> + </section> + + + <section><title>Improvements and New Features</title> + <list> + <item> + <p> + The ldap client eldap now supports the start_tls + operation. This upgrades an existing tcp connection to + encryption using tls, if the server supports it. See + eldap:start_tls/2 and /3.</p> + <p> + Own Id: OTP-11336</p> + </item> + </list> + </section> + +</section> + +<section><title>Eldap 1.0.1</title> <section><title>Improvements and New Features</title> <list> diff --git a/lib/eldap/test/eldap_basic_SUITE.erl b/lib/eldap/test/eldap_basic_SUITE.erl index 127d753b92..bf5fa83c3c 100644 --- a/lib/eldap/test/eldap_basic_SUITE.erl +++ b/lib/eldap/test/eldap_basic_SUITE.erl @@ -28,10 +28,19 @@ -define(TIMEOUT, 120000). % 2 min init_per_suite(Config) -> - ssl:start(), - chk_config(ldap_server, {"localhost",9876}, - chk_config(ldaps_server, {"localhost",9877}, - Config)). + StartSsl = try ssl:start() + catch + Error:Reason -> + {skip, lists:flatten(io_lib:format("eldap init_per_suite failed to start ssl Error=~p Reason=~p", [Error, Reason]))} + end, + case StartSsl of + ok -> + chk_config(ldap_server, {"localhost",9876}, + chk_config(ldaps_server, {"localhost",9877}, + Config)); + _ -> + StartSsl + end. end_per_suite(_Config) -> ok. diff --git a/lib/eldap/vsn.mk b/lib/eldap/vsn.mk index 4d05d3d1e3..dd1f50653c 100644 --- a/lib/eldap/vsn.mk +++ b/lib/eldap/vsn.mk @@ -1 +1 @@ -ELDAP_VSN = 1.0.1 +ELDAP_VSN = 1.0.2 |