wintest: get original nameserver for forwarding on a more general place
authorBjörn Baumbach <bb@sernet.de>
Thu, 21 Jun 2012 11:43:22 +0000 (13:43 +0200)
committerKai Blin <kai@samba.org>
Thu, 21 Jun 2012 19:55:20 +0000 (21:55 +0200)
Signed-off-by: Kai Blin <kai@samba.org>
wintest/wintest.py

index d01e94bf658e14bf781250c8245be64adedc05b9..38c4630eb989450042058917062119e315a9abaf 100644 (file)
@@ -325,11 +325,6 @@ nameserver %s
     def configure_bind(self, kerberos_support=False, include=None):
         self.chdir('${PREFIX}')
 
-        nameserver = self.get_nameserver()
-        if nameserver == self.getvar('INTERFACE_IP'):
-            raise RuntimeError("old /etc/resolv.conf must not contain %s as a nameserver, this will create loops with the generated dns configuration" % nameserver)
-        self.setvar('DNSSERVER', nameserver)
-
         if self.getvar('INTERFACE_IPV6'):
             ipv6_listen = 'listen-on-v6 port 53 { ${INTERFACE_IPV6}; };'
         else:
@@ -922,6 +917,11 @@ RebootOnCompletion=No
 
         self.load_config(self.opts.conf)
 
+        nameserver = self.get_nameserver()
+        if nameserver == self.getvar('INTERFACE_IP'):
+            raise RuntimeError("old /etc/resolv.conf must not contain %s as a nameserver, this will create loops with the generated dns configuration" % nameserver)
+        self.setvar('DNSSERVER', nameserver)
+
         self.set_skip(self.opts.skip)
         self.set_vms(self.opts.vms)