summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2014-04-23 23:28:13 +0200
committerHolger Weiss <holger@zedat.fu-berlin.de>2014-04-23 23:28:13 +0200
commitf988aad94073592ffe7461b3fa1f413a1ccd308d (patch)
tree357d9b6253927e2e0932b4d45fe11016e1e10160
parentMerge pull request #176 from hamano/devel (diff)
Log TLS status for outgoing s2s with SASL EXTERNAL
Diffstat (limited to '')
-rw-r--r--src/ejabberd_s2s_out.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
index a0a83631..58aa34d6 100644
--- a/src/ejabberd_s2s_out.erl
+++ b/src/ejabberd_s2s_out.erl
@@ -570,8 +570,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]),