From e965aae60a71b5c6ccb9c7674d6570a30a0cb89e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?= Date: Tue, 18 Jul 2006 12:29:17 +0000 Subject: [PATCH] * src/acl.erl: The server does not crash anymore on wrong acl rule. Add rule error message in log file (EJAB-118). SVN Revision: 589 --- ChangeLog | 5 +++++ src/acl.erl | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8bf619f65..884c6da6a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-07-16 Mickael Remond + + * src/acl.erl: The server does not crash anymore on wrong acl rule. Add + rule error message in log file. + 2006-07-07 Mickael Remond * src/web/ejabberd_web_admin.erl: User creation form now creates the diff --git a/src/acl.erl b/src/acl.erl index 61c997f88..a4417a59d 100644 --- a/src/acl.erl +++ b/src/acl.erl @@ -171,7 +171,13 @@ match_acl(ACL, JID, Host) -> is_glob_match(Server, SR); {node_glob, UR, SR} -> is_glob_match(Server, SR) andalso - is_glob_match(User, UR) + is_glob_match(User, UR); + WrongSpec -> + ?ERROR_MSG( + "Wrong ACL expression: ~p~n" + "Check your config file and reload it with the override_acls option enabled", + [WrongSpec]), + false end end, ets:lookup(acl, {ACL, global}) ++