From cea3bdb1031c95b874447676bcecfdd3b4731968 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= Date: Thu, 21 Jun 2012 13:45:18 +0200 Subject: wintest: enable dns forwarding for internal dns Internal DNS will forward dns requests to the original nameserver (specified in resolv.conf). Signed-off-by: Kai Blin Autobuild-User(master): Kai Blin Autobuild-Date(master): Thu Jun 21 23:47:35 CEST 2012 on sn-devel-104 --- wintest/test-s4-howto.py | 3 ++- wintest/wintest.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'wintest') diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py index 2f89447f227..fdbb18196c8 100755 --- a/wintest/test-s4-howto.py +++ b/wintest/test-s4-howto.py @@ -39,7 +39,8 @@ def provision_s4(t, func_level="2008"): '${USE_NTVFS}', '--dns-backend=${NAMESERVER_BACKEND}', '${ALLOW_DNS_UPDATES}', - '${DNS_RECURSIVE_QUERIES}'] + '${DNS_RECURSIVE_QUERIES}', + '${DNS_FORWARDER}'] if t.getvar('INTERFACE_IPV6'): provision.append('--host-ip6=${INTERFACE_IPV6}') t.run_cmd(provision) diff --git a/wintest/wintest.py b/wintest/wintest.py index 38c4630eb98..6257fb45ddc 100644 --- a/wintest/wintest.py +++ b/wintest/wintest.py @@ -955,6 +955,8 @@ RebootOnCompletion=No self.setvar('ALLOW_DNS_UPDATES', '--option=allow dns updates = True') # we need recursive queries, since host expects answers with RA-bit self.setvar('DNS_RECURSIVE_QUERIES', '--option=dns recursive queries = Yes') + self.setvar('DNS_FORWARDER', "--option=dns forwarder = %s" % nameserver) else: self.setvar('ALLOW_DNS_UPDATES', '') self.setvar('DNS_RECURSIVE_QUERIES', '') + self.setvar('DNS_FORWARDER', '') -- cgit v1.2.1