diff options
| author | Evgeny Khramtsov <xramtsov@gmail.com> | 2014-04-30 00:36:08 +0400 |
|---|---|---|
| committer | Evgeny Khramtsov <xramtsov@gmail.com> | 2014-04-30 00:36:08 +0400 |
| commit | 841932288450b5c6a193b8e5d5af4046f52fb887 (patch) | |
| tree | 2d657ac950a3f5416d6e2f58b4afd5f01d3092d4 /src | |
| parent | Merge pull request #185 from weiss/verify-cert-for-s2s-out (diff) | |
| parent | Check TLS state before requesting SASL EXTERNAL (diff) | |
Merge pull request #181 from weiss/check-tls-before-auth
Check TLS state before requesting SASL EXTERNAL for outgoing s2s connections
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_s2s_out.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl index 9977fcd7e..0f9056abe 100644 --- a/src/ejabberd_s2s_out.erl +++ b/src/ejabberd_s2s_out.erl @@ -600,7 +600,9 @@ wait_for_features({xmlstreamelement, El}, StateData) -> {next_state, stream_established, StateData#state{queue = queue:new()}}; SASLEXT and StateData#state.try_auth and - (StateData#state.new /= false) -> + (StateData#state.new /= false) and + (StateData#state.tls_enabled or + not StateData#state.tls_required) -> send_element(StateData, #xmlel{name = <<"auth">>, attrs = |