diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-10-09 13:12:35 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-10-09 13:12:35 +0200 |
| commit | 3abf1b5ef82478b152581152ad3ec749e8b7edaa (patch) | |
| tree | 667a69992382a0c3d5a941bf668fd27e97a29ac7 | |
| parent | 2e8c51a58225dff0ac88562a22413c23c2a845c0 (diff) | |
| parent | 1a7f7b4abf091f19772f27cfc65eff532c334694 (diff) | |
| download | otp-3abf1b5ef82478b152581152ad3ec749e8b7edaa.tar.gz otp-3abf1b5ef82478b152581152ad3ec749e8b7edaa.tar.bz2 otp-3abf1b5ef82478b152581152ad3ec749e8b7edaa.zip | |
Merge branch 'fredrik/eldap/do_connect_ssl_verify/OTP-11354' into maint
* fredrik/eldap/do_connect_ssl_verify/OTP-11354:
eldap: eldap does not support peer verification, removed {verify, 0} from ssl options
| -rw-r--r-- | lib/eldap/src/eldap.erl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/eldap/src/eldap.erl b/lib/eldap/src/eldap.erl index d11f904996..8ebb88e35b 100644 --- a/lib/eldap/src/eldap.erl +++ b/lib/eldap/src/eldap.erl @@ -42,8 +42,8 @@ log, % User provided log function timeout = infinity, % Request timeout anon_auth = false, % Allow anonymous authentication - use_tls = false, % LDAP/LDAPS - tls_opts = [] % ssl:ssloptsion() + use_tls = false, % LDAP/LDAPS + tls_opts = [] % ssl:ssloption() }). %%% For debug purposes @@ -389,8 +389,7 @@ try_connect([],_) -> do_connect(Host, Data, Opts) when Data#eldap.use_tls == false -> gen_tcp:connect(Host, Data#eldap.port, Opts, Data#eldap.timeout); do_connect(Host, Data, Opts) when Data#eldap.use_tls == 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 |