Merge 0.10->trunk

[prosody.git] / plugins / mod_proxy65.lua

diff --git a/plugins/mod_proxy65.lua b/plugins/mod_proxy65.lua
index 73527cbc1188f6c0277d39b6195f1b25afeafc40..cbbfad12cb45fd06c2653ec47bf369f8ba294592 100644 (file)
--- a/plugins/mod_proxy65.lua
+++ b/plugins/mod_proxy65.lua
@@ -91,9 +91,9 @@ end
 function module.add_host(module)
        local host, name = module:get_host(), module:get_option_string("name", "SOCKS5 Bytestreams Service");
 
-       local proxy_address = module:get_option("proxy65_address", host);
+       local proxy_address = module:get_option_string("proxy65_address", host);
        local proxy_port = next(portmanager.get_active_services():search("proxy65", nil)[1] or {});
-       local proxy_acl = module:get_option("proxy65_acl");
+       local proxy_acl = module:get_option_array("proxy65_acl");
 
        -- COMPAT w/pre-0.9 where proxy65_port was specified in the components section of the config
        local legacy_config = module:get_option_number("proxy65_port");