From a4449fe8d05f7b9994cc499b1c378ea284fd5085 Mon Sep 17 00:00:00 2001 From: Badlop Date: Mon, 10 Dec 2007 14:44:43 +0000 Subject: [PATCH] * src/mod_irc/mod_irc.erl: Bugfix in ACL check (thanks to Sergei Golovan) SVN Revision: 1061 --- ChangeLog | 7 ++++++- src/mod_irc/mod_irc.erl | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 17984670e..665eb49a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-12-10 Badlop + + * src/mod_irc/mod_irc.erl: Bugfix in ACL check (thanks to Sergei + Golovan) + 2007-12-10 Christophe Romain * src/mod_pubsub/mod_pubsub.erl: database upgrade bugfix @@ -929,7 +934,7 @@ 2007-06-22 Alexey Shchepin * 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 619cb27d9..7e1ebff3e 100644 --- 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); _ -> -- 2.40.0