Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-26 17:38:45 +01:00
Code Releases Activity

Fix ACLs syntax change (thanks to jokker23)(issue #140)

Browse Source
This commit is contained in:
Badlop 2014-03-24 19:40:55 +01:00
parent 2b527f5e9a
commit d5f90965d7
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/acl.erl
View File

@ -237,6 +237,8 @@ normalize_spec(Spec) ->
{server_regexp, SR} -> {server_regexp, b(SR)}; {server_regexp, SR} -> {server_regexp, b(SR)};
{server_glob, S} -> {server_glob, b(S)}; {server_glob, S} -> {server_glob, b(S)};
{resource_glob, R} -> {resource_glob, b(R)}; {resource_glob, R} -> {resource_glob, b(R)};
{ip, {Net, Mask}} ->
{ip, {Net, Mask}};
{ip, S} -> {ip, S} ->
case parse_ip_netmask(b(S)) of case parse_ip_netmask(b(S)) of
{ok, Net, Mask} -> {ok, Net, Mask} ->

2
src/ejabberd_web_admin.erl
View File

@ -1138,7 +1138,7 @@ string_to_spec2(ACLName, Val) ->
jlib:string_to_jid(Val), jlib:string_to_jid(Val),
case U of case U of
<<"">> -> {ACLName, S}; <<"">> -> {ACLName, S};
_ -> {ACLName, U, S} _ -> {ACLName, {U, S}}
end. end.
acl_parse_delete(ACLs, Query) -> acl_parse_delete(ACLs, Query) ->