aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-11-28 14:30:12 +0000
committerMatthew Wild <mwild1@gmail.com>2011-11-28 14:30:12 +0000
commit5a887a9e66c45c82c375c8abfcc4b43a410cac43 (patch)
tree512f5eefa45cefba9181527beabc653b684a638a /core
parent11a9469d1d494d42f02c965008788d67ce8677f8 (diff)
downloadprosody-5a887a9e66c45c82c375c8abfcc4b43a410cac43.tar.gz
prosody-5a887a9e66c45c82c375c8abfcc4b43a410cac43.zip
s2smanager: Use config over xmppserver's default interface
Diffstat (limited to 'core')
-rw-r--r--core/s2smanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index b930ceab..77a1b040 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -319,7 +319,7 @@ function try_connect(host_session, connect_host, connect_port, err)
if not sources then
sources = {};
- local cfg_sources = connlisteners_get("xmppserver").default_interface or config.get("*", "core", "interface");
+ local cfg_sources = config.get("*", "core", "interface") or connlisteners_get("xmppserver").default_interface;
for i, source in ipairs(cfg_sources) do
if source == "*" then
sources[i] = new_ip("0.0.0.0", "IPv4");