aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlexey Shchepin <alexey@process-one.net>2005-07-14 23:48:57 +0000
committerAlexey Shchepin <alexey@process-one.net>2005-07-14 23:48:57 +0000
commit2d09cf8a39fd63f588133b6c5f458344a876cc87 (patch)
tree377cadbdd940f31d23bf8e1325a3397cbf8aa777 /src
parent* src/mod_disco.erl: Fixed processing of host features and (diff)
* src/acl.erl: Slightly changed "access" option processing
SVN Revision: 377
Diffstat (limited to 'src')
-rw-r--r--src/acl.erl10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/acl.erl b/src/acl.erl
index c7ffb874c..61c997f88 100644
--- a/src/acl.erl
+++ b/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.