diff options
| author | Paweł Chmielowski <pchmielowski@process-one.net> | 2017-05-04 12:18:16 +0300 |
|---|---|---|
| committer | Paweł Chmielowski <pchmielowski@process-one.net> | 2017-05-04 13:01:22 +0300 |
| commit | c64e77a08cd065ab9ae9b53590853b4743e1dc9d (patch) | |
| tree | cb47b3b069c71f2dff018a76534e1df666442128 /src/ejabberd_web_admin.erl | |
| parent | cf53d834e9931151a46fed31e644d7eb05e816be (diff) | |
Catch exceptions from acl:add_list in web admin
Diffstat (limited to 'src/ejabberd_web_admin.erl')
| -rw-r--r-- | src/ejabberd_web_admin.erl | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/ejabberd_web_admin.erl b/src/ejabberd_web_admin.erl index f4186b3e5..0106bb9cd 100644 --- a/src/ejabberd_web_admin.erl +++ b/src/ejabberd_web_admin.erl @@ -740,7 +740,10 @@ process_admin(Host, {ok, Tokens, _} -> case erl_parse:parse_term(Tokens) of {ok, NewACLs} -> - acl:add_list(Host, NewACLs, true); + case catch acl:add_list(Host, NewACLs, true) of + ok -> ok; + _ -> error + end; _ -> error end; _ -> error @@ -779,8 +782,11 @@ process_admin(Host, case catch acl_parse_query(Host, Query) of {'EXIT', _} -> error; NewACLs -> - ?INFO_MSG("NewACLs at ~s: ~p", [Host, NewACLs]), - acl:add_list(Host, NewACLs, true) + ?INFO_MSG("NewACLs at ~s: ~p", [Host, NewACLs]), + case catch acl:add_list(Host, NewACLs, true) of + ok -> ok; + _ -> error + end end; _ -> nothing end, |