mirror of
https://github.com/processone/ejabberd.git
synced 2024-12-20 17:27:00 +01:00
Reintroduce change removed by mistake in 'Improve match macro'
This commit is contained in:
parent
dafea66c0f
commit
78dae4036e
@ -471,7 +471,9 @@ wait_auth_SASL_result(Config, ShouldFail) ->
|
|||||||
NS = if Type == client -> ?NS_CLIENT;
|
NS = if Type == client -> ?NS_CLIENT;
|
||||||
Type == server -> ?NS_SERVER
|
Type == server -> ?NS_SERVER
|
||||||
end,
|
end,
|
||||||
receive #stream_start{xmlns = NS, version = {1,0}} -> ok end,
|
Config2 = receive #stream_start{id = ID, xmlns = NS, version = {1,0}} ->
|
||||||
|
set_opt(stream_id, ID, Config)
|
||||||
|
end,
|
||||||
receive #stream_features{sub_els = Fs} ->
|
receive #stream_features{sub_els = Fs} ->
|
||||||
if Type == client ->
|
if Type == client ->
|
||||||
#xmpp_session{optional = true} =
|
#xmpp_session{optional = true} =
|
||||||
@ -488,7 +490,7 @@ wait_auth_SASL_result(Config, ShouldFail) ->
|
|||||||
set_opt(rosterver, true, ConfigAcc);
|
set_opt(rosterver, true, ConfigAcc);
|
||||||
(_, ConfigAcc) ->
|
(_, ConfigAcc) ->
|
||||||
ConfigAcc
|
ConfigAcc
|
||||||
end, Config, Fs)
|
end, Config2, Fs)
|
||||||
end;
|
end;
|
||||||
#sasl_challenge{text = ClientIn} ->
|
#sasl_challenge{text = ClientIn} ->
|
||||||
{Response, SASL} = (?config(sasl, Config))(ClientIn),
|
{Response, SASL} = (?config(sasl, Config))(ClientIn),
|
||||||
|
Loading…
Reference in New Issue
Block a user