diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2012-09-24 08:26:12 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2012-09-24 23:06:07 +0200 |
| commit | 6641d76562db10e6289c5e819b1296d8f6df37bf (patch) | |
| tree | 4f38e2d367c00cc6e892f465a16728c0a524ffbe | |
| parent | 61ce3e871a1fc1d16202d337d74c2e10f64b2c86 (diff) | |
| download | samba-6641d76562db10e6289c5e819b1296d8f6df37bf.tar.gz samba-6641d76562db10e6289c5e819b1296d8f6df37bf.tar.bz2 samba-6641d76562db10e6289c5e819b1296d8f6df37bf.zip | |
samba-tool domain-provision: Avoid python2.5-isms.
| -rw-r--r-- | source4/scripting/python/samba/netcmd/domain.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py index 5f34deb3c0..7d2421b246 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 |