summaryrefslogtreecommitdiff
path: root/source4/scripting
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2012-09-24 23:02:05 +0200
committerJelmer Vernooij <jelmer@samba.org>2012-09-25 00:48:42 +0200
commitf44ad3671876802a42846597be901257633e8ca3 (patch)
tree429d6dd6b132247cd3d6164bcde17630ad07193e /source4/scripting
parent78cb9fd91bc1ac73ad1a1deb8c9423f88729b707 (diff)
downloadsamba-f44ad3671876802a42846597be901257633e8ca3.tar.gz
samba-f44ad3671876802a42846597be901257633e8ca3.tar.bz2
samba-f44ad3671876802a42846597be901257633e8ca3.zip
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
Diffstat (limited to 'source4/scripting')
-rw-r--r--source4/scripting/python/samba/netcmd/domain.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py
index 2e8d7c965d..4c76f0b731 100644
--- 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