# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1331493209 0
# Node ID 869f38f1eee4b9f32202f7f6a4449534558bb98c
# Parent  d2bcb959d713cae8ec45fee36bb60b5385e52664# Parent  f9f5230d7a9c610a10560a7e4a11a7220a75ab19
Merge with Zash

diff -r d2bcb959d713 -r 869f38f1eee4 core/s2smanager.lua
--- 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;
diff -r d2bcb959d713 -r 869f38f1eee4 plugins/s2s/s2sout.lib.lua
--- 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;