summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoranupamasingh10 <anupamasingh31@gmail.com>2023-02-27 10:22:10 +0100
committerIngela Anderton Andin <ingela@erlang.org>2023-04-25 16:18:50 +0200
commitf1ac6ef8274009612774b63c1bb7259ee8abdb7b (patch)
tree57d1976cbfa091799abe86af0620e4f9d5939c90
parentb0d319a92f87ff7c1c7f384e8bfeeeae8d34d361 (diff)
downloaderlang-f1ac6ef8274009612774b63c1bb7259ee8abdb7b.tar.gz
Add new api conn_info for SSL connections to LDAP server
-rw-r--r--lib/eldap/doc/src/eldap.xml12
-rw-r--r--lib/ssl/src/ssl.erl4
2 files changed, 9 insertions, 7 deletions
diff --git a/lib/eldap/doc/src/eldap.xml b/lib/eldap/doc/src/eldap.xml
index 8f08514886..5efcbd4c86 100644
--- a/lib/eldap/doc/src/eldap.xml
+++ b/lib/eldap/doc/src/eldap.xml
@@ -550,20 +550,20 @@ Control2 = eldap:paged_result_control(PageSize, Cookie1),
</func>
<func>
<name since="@OTP-XXXX@">conn_info(Handle) -> {ok, Data} | {error, Reason}</name>
- <fsummary>Returns all the connection information.
+ <fsummary>When LDAP is run over TLS, returns information about the TLS connection.
</fsummary>
<type>
<v>Handle = handle()</v>
<v>Data = ssl:connection_info()</v>
</type>
- <desc><p>Returns the most relevant information for SSL connection to an LDAP server, ssl options
- that are undefined will be filtered out. Note that values that affect the security of the
- connection will only be returned if explicitly requested by conn_info/2.</p>
+ <desc><p>Returns the most relevant information for SSL connection to an LDAP server.
+ See also ssl:connection_information/1.</p>
</desc>
</func>
<func>
<name since="@OTP-XXXX@">conn_info(Handle, Items) -> {ok, Data} | {error, Reason}</name>
- <fsummary>Returns the requested connection information.
+ <fsummary>When LDAP is run over TLS, returns requested information items about the TLS
+ connection.
</fsummary>
<type>
<v>Handle = handle()</v>
@@ -571,7 +571,7 @@ Control2 = eldap:paged_result_control(PageSize, Cookie1),
<v>Data = ssl:connection_info()</v>
</type>
<desc><p>Returns the requested information items about the SSL connection to LDAP server,
- if they are defined.</p>
+ if they are defined. See also ssl:connection_information/2.</p>
</desc>
</func>
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index ad5028655d..08ebfae269 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -138,7 +138,9 @@
srp_param_type/0,
named_curve/0,
sign_scheme/0,
- group/0]).
+ group/0,
+ connection_info/0,
+ connection_info_items/0]).
%% -------------------------------------------------------------------------------------------------------