From fa72be8960c04e8d7744062f8af50e5f1a63de16 Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Mon, 7 Oct 2024 08:08:24 +0200 Subject: [PATCH 1/2] eldap: Add missing list indication to tls_start specs closes #8873 --- lib/eldap/src/eldap.erl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/eldap/src/eldap.erl b/lib/eldap/src/eldap.erl index 7d92e55173ae..ef6e8a47dcec 100644 --- a/lib/eldap/src/eldap.erl +++ b/lib/eldap/src/eldap.erl @@ -219,7 +219,7 @@ Same as start_tls(Handle, Options, infinity) -doc(#{since => <<"OTP R16B03">>}). -spec start_tls(Handle, TlsOptions) -> ok |{ok, Refs} | {error, Reason} when Handle :: handle(), - TlsOptions :: ssl:tls_client_option(), + TlsOptions :: [ssl:tls_client_option()], Refs :: {referral, referrals()}, Reason :: term(). start_tls(Handle, TlsOptions) -> @@ -254,7 +254,7 @@ upgrade (phase 1). -doc(#{since => <<"OTP R16B03">>}). -spec start_tls(Handle, TlsOptions, Timeout) -> ok | {ok, Refs} | {error, Reason} when Handle :: handle(), - TlsOptions :: ssl:tls_client_option(), + TlsOptions :: [ssl:tls_client_option()], Timeout :: infinity | pos_integer(), Refs :: {referral, referrals()}, Reason :: term(). From 8197b0624ce722b148d163a75d8e0b22fb82293e Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Fri, 18 Oct 2024 13:39:08 +0200 Subject: [PATCH 2/2] eldap: Improve specs --- lib/eldap/src/eldap.erl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/eldap/src/eldap.erl b/lib/eldap/src/eldap.erl index ef6e8a47dcec..ad60ca1b146a 100644 --- a/lib/eldap/src/eldap.erl +++ b/lib/eldap/src/eldap.erl @@ -200,8 +200,8 @@ All TCP socket options are accepted except `active`, `binary`, `deliver`, {log, function()} | {timeout, integer()} | {ssl, boolean()} | - {sslopts, list()} | - {tcpopts, list()}], + {sslopts, [ssl:tls_client_option()]} | + {tcpopts, [inet:inet_backend() | gen_tcp:connect_option()]}], Handle :: handle(), Reason :: term().