Cosmetic validator changes

diff --git a/src/mod_proxy65.erl b/src/mod_proxy65.erl
index beea35725cdd8a3984414be1e8b55c519fd175e5..2d0d9ae0a8b5f02130e946c57d8b6ec924d06008 100644 (file)
--- a/src/mod_proxy65.erl
+++ b/src/mod_proxy65.erl
@@ -93,12 +93,10 @@ mod_opt_type(auth_type) ->
     end;
 mod_opt_type(recbuf) ->
     fun (I) when is_integer(I), I > 0 -> I end;
-mod_opt_type(shaper) ->
-    fun (A) when is_atom(A) -> A end;
+mod_opt_type(shaper) -> fun acl:shaper_rules_validator/1;
 mod_opt_type(sndbuf) ->
     fun (I) when is_integer(I), I > 0 -> I end;
-mod_opt_type(access) ->
-    fun (A) when is_atom(A) -> A end;
+mod_opt_type(access) -> fun acl:access_rules_validator/1;
 mod_opt_type(host) -> fun iolist_to_binary/1;
 mod_opt_type(hostname) -> fun iolist_to_binary/1;
 mod_opt_type(ip) ->

diff --git a/src/mod_register.erl b/src/mod_register.erl
index 44a64539ea3491932f58b80d7417cc1db697b2f3..dc8ca995c7f0767a28e78747ffc4f4b60a678c33 100644 (file)
--- a/src/mod_register.erl
+++ b/src/mod_register.erl
@@ -613,14 +613,11 @@ check_ip_access(undefined, _IPAccess) ->
 check_ip_access(IPAddress, IPAccess) ->
     acl:match_rule(global, IPAccess, IPAddress).
 
-mod_opt_type(access) ->
-    fun acl:access_rules_validator/1;
-mod_opt_type(access_from) ->
-    fun (A) when is_atom(A) -> A end;
+mod_opt_type(access) -> fun acl:access_rules_validator/1;
+mod_opt_type(access_from) -> fun acl:access_rules_validator/1;
 mod_opt_type(captcha_protected) ->
     fun (B) when is_boolean(B) -> B end;
-mod_opt_type(ip_access) ->
-    fun acl:access_rules_validator/1;
+mod_opt_type(ip_access) -> fun acl:access_rules_validator/1;
 mod_opt_type(iqdisc) -> fun gen_iq_handler:check_type/1;
 mod_opt_type(password_strength) ->
     fun (N) when is_number(N), N >= 0 -> N end;