samba-tool domain-provision: Avoid python2.5-isms.
authorJelmer Vernooij <jelmer@samba.org>
Mon, 24 Sep 2012 06:26:12 +0000 (08:26 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 24 Sep 2012 21:06:07 +0000 (23:06 +0200)
source4/scripting/python/samba/netcmd/domain.py

index 5f34deb3c0d3a8d39620a535180a0ead5c17f828..7d2421b24670e5a5ffd8adad1b00bf0712ca85dc 100644 (file)
@@ -265,7 +265,10 @@ class cmd_domain_provision(Command):
 
         creds.set_kerberos_state(DONT_USE_KERBEROS)
 
-        suggested_forwarder = dns_forwarder is None and self._get_nameserver_ip() or dns_forwarder
+        if (dns_forwarder is None and self._get_nameserver_ip() or dns_forwarder):
+            suggested_forwarder = True
+        else:
+            suggested_forwarder = False
 
         if len(self.raw_argv) == 1:
             interactive = True