mirror of
https://github.com/processone/ejabberd.git
synced 2024-10-07 14:58:56 +02:00
* src/acl.erl: Slightly changed "access" option processing
SVN Revision: 377
This commit is contained in:
parent
9528651c35
commit
2d09cf8a39
@ -1,5 +1,7 @@
|
||||
2005-07-15 Alexey Shchepin <alexey@sevcom.net>
|
||||
|
||||
* src/acl.erl: Slightly changed "access" option processing
|
||||
|
||||
* src/mod_disco.erl: Fixed processing of host features and
|
||||
extra_domains option
|
||||
|
||||
|
10
src/acl.erl
10
src/acl.erl
@ -102,7 +102,15 @@ match_rule(Host, Rule, JID) ->
|
||||
undefined ->
|
||||
match_acls(GACLs, JID, Host);
|
||||
ACLs ->
|
||||
match_acls(GACLs ++ ACLs, JID, Host)
|
||||
case lists:reverse(GACLs) of
|
||||
[{allow, all} | Rest] ->
|
||||
match_acls(
|
||||
lists:reverse(Rest) ++ ACLs ++
|
||||
[{allow, all}],
|
||||
JID, Host);
|
||||
_ ->
|
||||
match_acls(GACLs ++ ACLs, JID, Host)
|
||||
end
|
||||
end
|
||||
end
|
||||
end.
|
||||
|
Loading…
Reference in New Issue
Block a user