aboutsummaryrefslogtreecommitdiff
path: root/src/mod_register.erl
diff options
context:
space:
mode:
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>2017-01-23 13:51:05 +0300
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>2017-01-23 13:51:05 +0300
commit435e5e62634b542c2a42673bea7f81e9cc2a5c04 (patch)
treeb927d972c426ca5ea4ce20343e4eb981848934e8 /src/mod_register.erl
parentMake a message is not bounced if it's archived (diff)
Make test suite working again
Diffstat (limited to 'src/mod_register.erl')
-rw-r--r--src/mod_register.erl9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mod_register.erl b/src/mod_register.erl
index 7bb60753b..875640e9f 100644
--- a/src/mod_register.erl
+++ b/src/mod_register.erl
@@ -79,7 +79,7 @@ stream_feature_register(Acc, Host) ->
AF = gen_mod:get_module_opt(Host, ?MODULE, access_from,
fun(A) -> A end,
all),
- case (AF /= none) and lists:keymember(sasl_mechanisms, 1, Acc) of
+ case (AF /= none) of
true ->
[#feature_register{}|Acc];
false ->
@@ -90,10 +90,11 @@ c2s_unauthenticated_packet(#{ip := IP, server := Server} = State,
#iq{type = T, sub_els = [_]} = IQ)
when T == set; T == get ->
case xmpp:get_subtag(IQ, #register{}) of
- #register{} ->
+ #register{} = Register ->
{Address, _} = IP,
- IQ1 = xmpp:set_from_to(IQ, jid:make(<<>>), jid:make(Server)),
- ResIQ = process_iq(IQ1, Address),
+ IQ1 = xmpp:set_els(IQ, [Register]),
+ IQ2 = xmpp:set_from_to(IQ1, jid:make(<<>>), jid:make(Server)),
+ ResIQ = process_iq(IQ2, Address),
ResIQ1 = xmpp:set_from_to(ResIQ, jid:make(Server), undefined),
{stop, ejabberd_c2s:send(State, ResIQ1)};
false ->