diff options
| author | Badlop <badlop@process-one.net> | 2013-09-26 16:41:57 +0200 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2013-09-26 16:41:57 +0200 |
| commit | 389a99b2dbb34c031aa2033ff2b911c0518d3b15 (patch) | |
| tree | 5af0c565c4cfd7f358cc8a63ee9b717c13477d48 /src | |
| parent | Fix roster version support (diff) | |
Fix bypass for tls-required (thanks to Zeha)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_s2s_in.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl index 2ad335657..dd1c93c8d 100644 --- a/src/ejabberd_s2s_in.erl +++ b/src/ejabberd_s2s_in.erl @@ -293,7 +293,9 @@ wait_for_stream({xmlstreamstart, _Name, Attrs}, [Server])}), {next_state, stream_established, StateData}; {<<"jabber:server">>, <<"jabber:server:dialback">>, - _Server, _} -> + _Server, _} when + (StateData#state.tls_required and StateData#state.tls_enabled) + or (not StateData#state.tls_required) -> send_text(StateData, ?STREAM_HEADER(<<"">>)), {next_state, stream_established, StateData}; _ -> |