* src/mod_irc/mod_irc.erl: Bugfix in ACL check (thanks to Sergei

Golovan)

SVN Revision: 1061

diff --git a/ChangeLog b/ChangeLog
index 17984670e5629a89777de59e48f38ea57f905d05..665eb49a691dfb7b73472d3375308cb565c6589f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-10  Badlop  <badlop@process-one.net>
+
+       * src/mod_irc/mod_irc.erl: Bugfix in ACL check (thanks to Sergei
+       Golovan)
+
 2007-12-10  Christophe Romain <christophe.romain@process-one.net>
 
        * src/mod_pubsub/mod_pubsub.erl: database upgrade bugfix
@@ -929,7 +934,7 @@
 2007-06-22  Alexey Shchepin  <alexey@sevcom.net>
 
        * src/mod_irc/mod_irc.erl: Added an option for default IRC
-       encoding (thanks to Badlop)
+       encoding (thanks to Badlop) (EJAB-452)
        * doc/guide.tex: Updated
 
        * src/mod_disco.erl: Don't override accumulated value in

diff --git a/src/mod_irc/mod_irc.erl b/src/mod_irc/mod_irc.erl
index 619cb27d9f96780b6df27a4935f72708958c08f5..7e1ebff3ed9fad66ab51e2a38bea994ef7c22fd5 100644 (file)
--- a/src/mod_irc/mod_irc.erl
+++ b/src/mod_irc/mod_irc.erl
@@ -171,7 +171,7 @@ stop_supervisor(Host) ->
     supervisor:delete_child(ejabberd_sup, Proc).
 
 do_route(Host, ServerHost, Access, From, To, Packet, DefEnc) ->
-    case acl:match_rule(Host, Access, From) of
+    case acl:match_rule(ServerHost, Access, From) of
        allow ->
            do_route1(Host, ServerHost, From, To, Packet, DefEnc);
        _ ->