diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-03-03 01:12:16 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-03-03 01:12:16 +0000 |
| commit | 66cfee9b84e3d6c947e238574006fc3fbf586915 (patch) | |
| tree | 8f9d31409a96454dcd8a82185d2c76e39ba810d4 /core | |
| parent | 203c5b4d85329a3420bc76f71c921731ca28a60a (diff) | |
| parent | 9af8ea363badf58a8d59e475035a4def10dd42c9 (diff) | |
| download | prosody-66cfee9b84e3d6c947e238574006fc3fbf586915.tar.gz prosody-66cfee9b84e3d6c947e238574006fc3fbf586915.zip | |
Merge with Zash
Diffstat (limited to 'core')
| -rw-r--r-- | core/portmanager.lua | 2 |
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); |