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

diff --git a/src/acl.erl b/src/acl.erl
index 32c743ede53afc9e3d773c5accd58f6dd5a3032e..809d6ff33a92477ebf623daa2fb4ffa81347b50a 100644 (file)
--- a/src/acl.erl
+++ b/src/acl.erl
@@ -237,6 +237,8 @@ normalize_spec(Spec) ->
         {server_regexp, SR} -> {server_regexp, b(SR)};
         {server_glob, S} -> {server_glob, b(S)};
         {resource_glob, R} -> {resource_glob, b(R)};
+        {ip, {Net, Mask}} ->
+            {ip, {Net, Mask}};
         {ip, S} ->
             case parse_ip_netmask(b(S)) of
                 {ok, Net, Mask} ->

diff --git a/src/ejabberd_web_admin.erl b/src/ejabberd_web_admin.erl
index c8974e637ad16720e37f304d89851e1a18236da1..9f5a5f08f9a0c4b4a8d86e377168f5e574b57e7b 100644 (file)
--- a/src/ejabberd_web_admin.erl
+++ b/src/ejabberd_web_admin.erl
@@ -1138,7 +1138,7 @@ string_to_spec2(ACLName, Val) ->
        jlib:string_to_jid(Val),
     case U of
       <<"">> -> {ACLName, S};
-      _ -> {ACLName, U, S}
+      _ -> {ACLName, {U, S}}
     end.
 
 acl_parse_delete(ACLs, Query) ->