Software / code / prosody
Changeset
4600:869f38f1eee4
Merge with Zash
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 11 Mar 2012 19:13:29 +0000 |
| parents | 4598:d2bcb959d713 (current diff) 4599:f9f5230d7a9c (diff) |
| children | 4601:4007b9f9aa5f |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/core/s2smanager.lua Sun Mar 11 18:35:27 2012 +0000 +++ b/core/s2smanager.lua Sun Mar 11 19:13:29 2012 +0000 @@ -37,7 +37,6 @@ 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;
--- a/plugins/s2s/s2sout.lib.lua Sun Mar 11 18:35:27 2012 +0000 +++ b/plugins/s2s/s2sout.lib.lua Sun Mar 11 19:13:29 2012 +0000 @@ -23,6 +23,8 @@ 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;
