aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-03-11 19:13:29 +0000
committerMatthew Wild <mwild1@gmail.com>2012-03-11 19:13:29 +0000
commite946a02f11d42a927fc3ecb44aa3357d41ece29a (patch)
tree7c582375d8135564e36e347cf72a7574e68446b1 /core
parente7eecd81b727f653c5e3f7ecf3da956dc94cf5eb (diff)
parent9ed71a359e09c1997955346837afbd9749d1e12d (diff)
downloadprosody-e946a02f11d42a927fc3ecb44aa3357d41ece29a.tar.gz
prosody-e946a02f11d42a927fc3ecb44aa3357d41ece29a.zip
Merge with Zash
Diffstat (limited to 'core')
-rw-r--r--core/s2smanager.lua1
1 files changed, 0 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;