* 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

diff --git a/ChangeLog b/ChangeLog
index 8bf619f654ef98aa6663d148c75e7807944673ae..884c6da6a738281c861cbe3b034b7fc31dadf6b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-16  Mickael Remond  <mickael.remond@process-one.net>
+
+       * 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  <mickael.remond@process-one.net>
 
        * src/web/ejabberd_web_admin.erl: User creation form now creates the

diff --git a/src/acl.erl b/src/acl.erl
index 61c997f88c6d634dcc54ce301eb48fd885effc53..a4417a59d652ff63ff514bd7313f5b10950b6d77 100644 (file)
--- 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}) ++