aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2012-03-03 00:54:19 +0100
committerKim Alvefur <zash@zash.se>2012-03-03 00:54:19 +0100
commit25b408fcaf0f3b11fe550d68681d13b64cc2a222 (patch)
treefcf3bb5da9d1923496bfdf6dfe0ac135c821c3fd /core
parent92dbf7e7a2a3ad3139d2a884cf90c740acfa9987 (diff)
downloadprosody-25b408fcaf0f3b11fe550d68681d13b64cc2a222.tar.gz
prosody-25b408fcaf0f3b11fe550d68681d13b64cc2a222.zip
core.portmanager: Make sure the private flag takes precedence over global interfaces
Diffstat (limited to 'core')
-rw-r--r--core/portmanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/portmanager.lua b/core/portmanager.lua
index 353c4a89..3d6dada4 100644
--- a/core/portmanager.lua
+++ b/core/portmanager.lua
@@ -62,9 +62,9 @@ function activate_service(service_name)
local bind_interfaces = set.new(config.get("*", service_name.."_interfaces")
or config.get("*", service_name.."_interface") -- COMPAT w/pre-0.9
+ or (service_info.private and default_local_interfaces)
or config.get("*", "interfaces")
or config.get("*", "interface") -- COMPAT w/pre-0.9
- or (service_info.private and default_local_interfaces)
or service_info.default_interface -- COMPAT w/pre0.9
or default_interfaces);