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 <kai@samba.org>
Autobuild-User(master): Kai Blin <kai@samba.org>
Autobuild-Date(master): Thu Jun 21 23:47:35 CEST 2012 on sn-devel-104

diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py
index 2f89447f227a07fff73bfe4f0b2c0605ead061fc..fdbb18196c89601f4b7bb5b8f9df0d679873caae 100755 (executable)
--- 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 38c4630eb989450042058917062119e315a9abaf..6257fb45ddc63a2d6cbd9343c8186e071004a226 100644 (file)
--- 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', '')