summaryrefslogtreecommitdiff
path: root/src/mod_register.erl
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2015-12-07 18:30:52 +0100
committerBadlop <badlop@process-one.net>2015-12-07 18:30:52 +0100
commit3e57850da7bf4fce4961085fa53f1e271d1300b2 (patch)
treeb603f35222c84a57a701e072183e671446647df2 /src/mod_register.erl
parentFix more places where random:seed is used (diff)
If mod_register access_from is 'none', then don't advertise IBR (#857)
Diffstat (limited to 'src/mod_register.erl')
-rw-r--r--src/mod_register.erl7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mod_register.erl b/src/mod_register.erl
index da0b805e..5628dbf8 100644
--- a/src/mod_register.erl
+++ b/src/mod_register.erl
@@ -72,8 +72,11 @@ stop(Host) ->
gen_iq_handler:remove_iq_handler(ejabberd_sm, Host,
?NS_REGISTER).
-stream_feature_register(Acc, _Host) ->
- case lists:keymember(<<"mechanisms">>, 2, Acc) of
+stream_feature_register(Acc, Host) ->
+ AF = gen_mod:get_module_opt(Host, ?MODULE, access_from,
+ fun(A) when is_atom(A) -> A end,
+ all),
+ case (AF /= none) and lists:keymember(<<"mechanisms">>, 2, Acc) of
true ->
[#xmlel{name = <<"register">>,
attrs = [{<<"xmlns">>, ?NS_FEATURE_IQREGISTER}],