diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-03-11 19:13:29 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-03-11 19:13:29 +0000 |
| commit | 2f97844affa452447001c36aee1d9bff88c211d6 (patch) | |
| tree | 7c582375d8135564e36e347cf72a7574e68446b1 | |
| parent | 30314b5891a1eb96c6b5fc7d9235695c3077e54e (diff) | |
| parent | 26768f3e54805074211fc0846221acce5765f570 (diff) | |
| download | prosody-2f97844affa452447001c36aee1d9bff88c211d6.tar.gz prosody-2f97844affa452447001c36aee1d9bff88c211d6.zip | |
Merge with Zash
| -rw-r--r-- | core/s2smanager.lua | 1 | ||||
| -rw-r--r-- | plugins/s2s/s2sout.lib.lua | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua index c05f7229..158b5461 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -37,7 +37,6 @@ local sha256_hash = require "util.hashes".sha256; local adns, dns = require "net.adns", require "net.dns"; local config = require "core.configmanager"; local dns_timeout = config.get("*", "core", "dns_timeout") or 15; -local max_dns_depth = config.get("*", "core", "dns_max_depth") or 3; local cfg_sources = config.get("*", "core", "s2s_interface") or config.get("*", "core", "interface"); local sources; diff --git a/plugins/s2s/s2sout.lib.lua b/plugins/s2s/s2sout.lib.lua index 808c7e74..4fcb094a 100644 --- a/plugins/s2s/s2sout.lib.lua +++ b/plugins/s2s/s2sout.lib.lua @@ -23,6 +23,8 @@ local s2s_destroy_session = require "core.s2smanager".destroy_session; local cfg_sources = config.get("*", "core", "s2s_interfaces") or socket.local_addresses and socket.local_addresses() or { "*" }; +local max_dns_depth = module:get_option_number("dns_max_depth", 3); + local s2sout = {}; local s2s_listener; |