diff options
| author | Björn Baumbach <bb@sernet.de> | 2012-06-21 13:45:18 +0200 |
|---|---|---|
| committer | Kai Blin <kai@samba.org> | 2012-06-21 23:47:35 +0200 |
| commit | cea3bdb1031c95b874447676bcecfdd3b4731968 (patch) | |
| tree | 38e6661466167376caa7438d752c598b000e5f4a | |
| parent | 1318b5bb2c6ebc2a810cb899a27daf5d90505559 (diff) | |
| download | samba-cea3bdb1031c95b874447676bcecfdd3b4731968.tar.gz samba-cea3bdb1031c95b874447676bcecfdd3b4731968.tar.bz2 samba-cea3bdb1031c95b874447676bcecfdd3b4731968.zip | |
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
| -rwxr-xr-x | wintest/test-s4-howto.py | 3 | ||||
| -rw-r--r-- | wintest/wintest.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py index 2f89447f22..fdbb18196c 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 38c4630eb9..6257fb45dd 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', '') |