samba-tool domain provision: DNS forwarder is not a boolean.

Autobuild-User(master): Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date(master): Tue Sep 25 00:48:43 CEST 2012 on sn-devel-104

diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py
index 2e8d7c965dfc4057d3c3e1c7d61ad0e3f1984f90..4c76f0b7310180aae2d0b0e28fb1023a40621e60 100644 (file)
--- a/source4/scripting/python/samba/netcmd/domain.py
+++ b/source4/scripting/python/samba/netcmd/domain.py
@@ -265,10 +265,10 @@ class cmd_domain_provision(Command):
 
         creds.set_kerberos_state(DONT_USE_KERBEROS)
 
-        if (dns_forwarder is None and self._get_nameserver_ip() or dns_forwarder):
-            suggested_forwarder = True
+        if dns_forwarder is not None:
+            suggested_forwarder = dns_forwarder
         else:
-            suggested_forwarder = False
+            suggested_forwarder = self._get_nameserver_ip()
 
         if len(self.raw_argv) == 1:
             interactive = True