Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-22 16:20:52 +01:00
Code Releases Activity

* src/acl.erl: The server does not crash anymore on wrong acl rule. Add

Browse Source 
rule error message in log file (EJAB-118).

SVN Revision: 589
This commit is contained in:
Mickaël Rémond 2006-07-18 12:29:17 +00:00
parent 6290bac932
commit e965aae60a
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 2006-07-07 Mickael Remond <mickael.remond@process-one.net>
* src/web/ejabberd_web_admin.erl: User creation form now creates the * src/web/ejabberd_web_admin.erl: User creation form now creates the

8
src/acl.erl
View File

@ -171,7 +171,13 @@ match_acl(ACL, JID, Host) ->
is_glob_match(Server, SR); is_glob_match(Server, SR);
{node_glob, UR, SR} -> {node_glob, UR, SR} ->
is_glob_match(Server, SR) andalso 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
end, end,
ets:lookup(acl, {ACL, global}) ++ ets:lookup(acl, {ACL, global}) ++