diff options
| author | Evgeny Khramtsov <xramtsov@gmail.com> | 2014-04-30 00:38:18 +0400 |
|---|---|---|
| committer | Evgeny Khramtsov <xramtsov@gmail.com> | 2014-04-30 00:38:18 +0400 |
| commit | 9563b0228f7f897e2e0c75d7a2043f5cbf45b457 (patch) | |
| tree | c9a917d4fce6601b7cd0ebcc400217b1ed0f166a | |
| parent | Merge pull request #181 from weiss/check-tls-before-auth (diff) | |
| parent | Log TLS status for outgoing s2s with SASL EXTERNAL (diff) | |
Merge pull request #177 from weiss/log-tls-sasl-external
Log TLS status for outgoing s2s with SASL EXTERNAL
| -rw-r--r-- | src/ejabberd_s2s_out.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl index 0f9056abe..052729314 100644 --- a/src/ejabberd_s2s_out.erl +++ b/src/ejabberd_s2s_out.erl @@ -592,8 +592,10 @@ wait_for_features({xmlstreamelement, El}, StateData) -> if not SASLEXT and not StartTLS and StateData#state.authenticated -> send_queue(StateData, StateData#state.queue), - ?INFO_MSG("Connection established: ~s -> ~s", - [StateData#state.myname, StateData#state.server]), + ?INFO_MSG("Connection established: ~s -> ~s with " + "SASL EXTERNAL and TLS=~p", + [StateData#state.myname, StateData#state.server, + StateData#state.tls_enabled]), ejabberd_hooks:run(s2s_connect_hook, [StateData#state.myname, StateData#state.server]), |