diff options
Diffstat (limited to 'src/mod_delegation.erl')
-rw-r--r-- | src/mod_delegation.erl | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/src/mod_delegation.erl b/src/mod_delegation.erl index baad79af3..f41c7610c 100644 --- a/src/mod_delegation.erl +++ b/src/mod_delegation.erl @@ -61,7 +61,15 @@ reload(_Host, _NewOpts, _OldOpts) -> ok. mod_opt_type(iqdisc) -> fun gen_iq_handler:check_type/1; -mod_opt_type(namespaces) -> validate_fun(); +mod_opt_type(namespaces) -> + fun(L) -> + lists:map( + fun({NS, Opts}) -> + Attrs = proplists:get_value(filtering, Opts, []), + Access = proplists:get_value(access, Opts, none), + {NS, Attrs, Access} + end, L) + end; mod_opt_type(_) -> [namespaces, iqdisc]. @@ -142,8 +150,7 @@ handle_cast({component_connected, Host}, State) -> ServerHost = State#state.server_host, To = jid:make(Host), NSAttrsAccessList = gen_mod:get_module_opt( - ServerHost, ?MODULE, namespaces, - validate_fun(), []), + ServerHost, ?MODULE, namespaces, []), lists:foreach( fun({NS, _Attrs, Access}) -> case acl:match_rule(ServerHost, Access, To) of @@ -342,13 +349,3 @@ disco_identity(Acc, _From, _To, _Node, _Lang, _Type) -> my_features(ejabberd_local) -> [?NS_DELEGATION]; my_features(ejabberd_sm) -> []. - -validate_fun() -> - fun(L) -> - lists:map( - fun({NS, Opts}) -> - Attrs = proplists:get_value(filtering, Opts, []), - Access = proplists:get_value(access, Opts, none), - {NS, Attrs, Access} - end, L) - end. |