Report more TLS errors

diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 1b7bac130a840322673e19d4938f5f7f9a319e4f..13e685022d742ceeec9c43357da23341c05ab45f 100644 (file)
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -276,8 +276,7 @@ process_terminated(#{sockmod := SockMod, socket := Socket, jid := JID} = State,
     bounce_message_queue(),
     State1;
 process_terminated(#{sockmod := SockMod, socket := Socket,
-                    stop_reason := {tls, no_certfile}} = State, Reason) ->
-    %% TODO: we probably need to report more TLS errors here
+                    stop_reason := {tls, _}} = State, Reason) ->
     ?ERROR_MSG("(~s) Failed to secure c2s connection: ~s",
               [SockMod:pp(Socket), format_reason(State, Reason)]),
     State;

diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl
index 1cddfec699b81073fe5b6491b3e9deef0b4e5942..1a25ee7b96b5a7a4c2e4405ccec8cdef512d83f4 100644 (file)
--- a/src/ejabberd_s2s_in.erl
+++ b/src/ejabberd_s2s_in.erl
@@ -288,8 +288,7 @@ handle_info(Info, #{server_host := LServer} = State) ->
 terminate(Reason, #{auth_domains := AuthDomains,
                    sockmod := SockMod, socket := Socket} = State) ->
     case maps:get(stop_reason, State, undefined) of
-       {tls, no_certfile} = Err ->
-           %% TODO: we probably need to report more TLS errors here
+       {tls, _} = Err ->
            ?ERROR_MSG("(~s) Failed to secure inbound s2s connection: ~s",
                       [SockMod:pp(Socket), xmpp_stream_in:format_error(Err)]);
        _ ->