From: Alexey Shchepin <alexey@process-one.net>
Date: Thu, 14 Jul 2005 23:48:57 +0000 (+0000)
Subject: * src/acl.erl: Slightly changed "access" option processing
X-Git-Tag: v0.9.8~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2d09cf8a39fd63f588133b6c5f458344a876cc87;p=ejabberd

* src/acl.erl: Slightly changed "access" option processing

SVN Revision: 377
---

diff --git a/ChangeLog b/ChangeLog
index 105d1f405..9412e948a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
 
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.