diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-07-10 10:14:08 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-07-10 10:14:08 +0300 |
| commit | d03432a95608494650ce41bcb0d6e25479ce0cd0 (patch) | |
| tree | 2539980b5aa4883257be334587df6c1e44057829 /src/ejabberd_s2s_in.erl | |
| parent | mod_stream_mgmt: Remove dead case clauses (diff) | |
Fix regression: list SASL EXTERNAL mechanism for inbound s2s
Diffstat (limited to 'src/ejabberd_s2s_in.erl')
| -rw-r--r-- | src/ejabberd_s2s_in.erl | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl index 20106ab6..8a681bbb 100644 --- a/src/ejabberd_s2s_in.erl +++ b/src/ejabberd_s2s_in.erl @@ -30,8 +30,7 @@ %% xmpp_stream_in callbacks -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). --export([tls_options/1, tls_required/1, tls_enabled/1, - compress_methods/1, sasl_mechanisms/2, +-export([tls_options/1, tls_required/1, tls_enabled/1, compress_methods/1, unauthenticated_stream_features/1, authenticated_stream_features/1, handle_stream_start/2, handle_stream_end/2, handle_stream_established/1, handle_auth_success/4, @@ -147,12 +146,6 @@ tls_required(#{server_host := LServer}) -> tls_enabled(#{server_host := LServer}) -> ejabberd_s2s:tls_enabled(LServer). -sasl_mechanisms(Mechs, #{server_host := LServer}) -> - lists:filter( - fun(<<"EXTERNAL">>) -> ejabberd_s2s:tls_verify(LServer); - (_) -> false - end, Mechs). - compress_methods(#{server_host := LServer}) -> case ejabberd_s2s:zlib_enabled(LServer) of true -> [<<"zlib">>]; |