diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-10-09 13:14:40 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-10-09 13:14:40 +0200 |
| commit | 59273a5b823e9f09933e245d0b2d54a324e4f40a (patch) | |
| tree | 5313c66bcc2739ce975d8b3e3d053592115a0bc0 /lib | |
| parent | 5c61f1e9a0d20233e9c3f84c73d48328faa9d47a (diff) | |
| parent | 3abf1b5ef82478b152581152ad3ec749e8b7edaa (diff) | |
| download | otp-59273a5b823e9f09933e245d0b2d54a324e4f40a.tar.gz otp-59273a5b823e9f09933e245d0b2d54a324e4f40a.tar.bz2 otp-59273a5b823e9f09933e245d0b2d54a324e4f40a.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib')
| -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 |