diff options
author | Henrik Nord <[email protected]> | 2014-02-24 16:16:04 +0100 |
---|---|---|
committer | Henrik Nord <[email protected]> | 2014-02-24 16:16:04 +0100 |
commit | c09955d29b6e4322b3a8adff962ff62d9c47647e (patch) | |
tree | 00a471fabacaf253a63b1dd92b9f4bdd6a55824a /lib/eldap/doc/src/eldap.xml | |
parent | 4203d5c2acb4e807835b85a568a3e1dff21c930a (diff) | |
parent | 02d46a1464c3bcd69b0de046c21146ccc6bf10c4 (diff) | |
download | otp-c09955d29b6e4322b3a8adff962ff62d9c47647e.tar.gz otp-c09955d29b6e4322b3a8adff962ff62d9c47647e.tar.bz2 otp-c09955d29b6e4322b3a8adff962ff62d9c47647e.zip |
Merge branch 'efine/eldap-IPv6-connections/OTP-11753'
* efine/eldap-IPv6-connections/OTP-11753:
Add support for IPv6 connections
Diffstat (limited to 'lib/eldap/doc/src/eldap.xml')
-rw-r--r-- | lib/eldap/doc/src/eldap.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/eldap/doc/src/eldap.xml b/lib/eldap/doc/src/eldap.xml index 228d3b34c3..8009a8d6a3 100644 --- a/lib/eldap/doc/src/eldap.xml +++ b/lib/eldap/doc/src/eldap.xml @@ -69,12 +69,13 @@ filter() See present/1, substrings/2, <fsummary>Open a connection to an LDAP server.</fsummary> <type> <v>Handle = handle()</v> - <v>Option = {port, integer()} | {log, function()} | {timeout, integer()} | {ssl, boolean()} | {sslopts, list()}</v> + <v>Option = {port, integer()} | {log, function()} | {timeout, integer()} | {ssl, boolean()} | {sslopts, list()} | {tcpopts, list()}</v> </type> <desc> <p>Setup a connection to an LDAP server, the <c>HOST</c>'s are tried in order.</p> <p>The log function takes three arguments, <c>fun(Level, FormatString, [FormatArg]) end</c>.</p> <p>Timeout set the maximum time in milliseconds that each server request may take.</p> + <p>Currently, the only TCP socket option accepted is <c>inet6</c>. Default is <c>inet</c>.</p> </desc> </func> <func> |