From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 24 Sep 2012 06:26:12 +0000 (+0200)
Subject: samba-tool domain-provision: Avoid python2.5-isms.
X-Git-Tag: talloc-2.0.8~173
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6641d76562db10e6289c5e819b1296d8f6df37bf;p=thirdparty%2Fsamba.git

samba-tool domain-provision: Avoid python2.5-isms.
---

diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py
index 5f34deb3c0d..7d2421b2467 100644
--- a/source4/scripting/python/samba/netcmd/domain.py
+++ b/source4/scripting/python/samba/netcmd/domain.py
@@ -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