diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2014-04-28 00:17:05 +0200 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2014-04-28 00:17:05 +0200 |
| commit | 1aa4ed3f35d07b62a5ccc0568a55ec464eb7d478 (patch) | |
| tree | 8c7c9549217a75fdf47dd9994f4e0d8443514e10 | |
| parent | Send stream trailer before closing s2s connection (diff) | |
Don't mess with s2s out when aborting s2s in
Don't try to look up and close outgoing connections to a given server
when aborting incoming connections from that server due to certificate
verification errors. The ejabberd_s2s:find_connection/2 call actually
created one or more *new* connections if less than 'max_s2s_connections'
connections were found. Then, no more than one of those possibly new
connections were stopped by the ejabberd_s2s_out:stop_connection/1 call.
It's not really necessary to bother with outgoing connections at all,
here.
| -rw-r--r-- | src/ejabberd_s2s_in.erl | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl index aa55c2e63..a3e772dfc 100644 --- a/src/ejabberd_s2s_in.erl +++ b/src/ejabberd_s2s_in.erl @@ -297,13 +297,6 @@ wait_for_stream({xmlstreamstart, _Name, Attrs}, <<(xml:element_to_binary(?SERRT_POLICY_VIOLATION(<<"en">>, CertError)))/binary, (?STREAM_TRAILER)/binary>>), - {atomic, Pid} = - ejabberd_s2s:find_connection(jlib:make_jid(<<"">>, - Server, <<"">>), - jlib:make_jid(<<"">>, - RemoteServer, - <<"">>)), - ejabberd_s2s_out:stop_connection(Pid), {stop, normal, StateData}; {VerifyResult, RemoteServer, Msg} -> {SASL, NewStateData} = case VerifyResult of |