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
commitf886be3d2c699f58a84b37c2ec51cdd14ebf6fe7 (patch)
treefcf3bb5da9d1923496bfdf6dfe0ac135c821c3fd /core
parentb7e7de7a209082695416b51761e9bc34835594e1 (diff)
downloadprosody-f886be3d2c699f58a84b37c2ec51cdd14ebf6fe7.tar.gz
prosody-f886be3d2c699f58a84b37c2ec51cdd14ebf6fe7.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);