aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2013-10-29 15:28:45 +0100
committerHans Nilsson <[email protected]>2013-10-29 15:28:45 +0100
commitdcd763ba7c4805361f435cc82d98335c2a59e1d1 (patch)
treeae863648adc4480d5b5c5f396dc38c88b35e11ff
parentce6642bc93384677acb627052e2c0e1348437347 (diff)
parentee47ef6189651ffadebc3fad0933f12017e5de59 (diff)
downloadotp-dcd763ba7c4805361f435cc82d98335c2a59e1d1.tar.gz
otp-dcd763ba7c4805361f435cc82d98335c2a59e1d1.tar.bz2
otp-dcd763ba7c4805361f435cc82d98335c2a59e1d1.zip
Merge branch 'hans/eldap/starttls/OTP-11336' into maint
* hans/eldap/starttls/OTP-11336: eldap: re-fixed earlier bug fix...
-rw-r--r--lib/eldap/src/eldap.erl5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/eldap/src/eldap.erl b/lib/eldap/src/eldap.erl
index 27246996e3..af5bf94c97 100644
--- a/lib/eldap/src/eldap.erl
+++ b/lib/eldap/src/eldap.erl
@@ -47,7 +47,7 @@
anon_auth = false, % Allow anonymous authentication
ldaps = false, % LDAP/LDAPS
using_tls = false, % true if LDAPS or START_TLS executed
- tls_opts = [] % ssl:ssloptsion()
+ tls_opts = [] % ssl:ssloption()
}).
%%% For debug purposes
@@ -403,8 +403,7 @@ try_connect([],_) ->
do_connect(Host, Data, Opts) when Data#eldap.ldaps == false ->
gen_tcp:connect(Host, Data#eldap.port, Opts, Data#eldap.timeout);
do_connect(Host, Data, Opts) when Data#eldap.ldaps == true ->
- SslOpts = [{verify,0} | Opts ++ Data#eldap.tls_opts],
- ssl:connect(Host, Data#eldap.port, SslOpts).
+ ssl:connect(Host, Data#eldap.port, Opts++Data#eldap.tls_opts).
loop(Cpid, Data) ->
receive