summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicky Nance <ricky.nance@weaubleau.k12.mo.us>2012-09-26 17:24:40 -0700
committerJelmer Vernooij <jelmer@samba.org>2012-09-27 04:35:33 +0200
commitee0012de1af1a3899856bcdb80033d1a82d5b174 (patch)
tree9dea79dcca8cf2159c72a64e8ef7bb42ed0f25f7
parentba7075597e5c28f50f3695c59a5050d1c2c98ae4 (diff)
downloadsamba-ee0012de1af1a3899856bcdb80033d1a82d5b174.tar.gz
samba-ee0012de1af1a3899856bcdb80033d1a82d5b174.tar.bz2
samba-ee0012de1af1a3899856bcdb80033d1a82d5b174.zip
samba-tool domain provision: DNS forwarder default
Provision would break with an exception if there was no value given for the DNS forwarder, this simply sets a default to "none". Signed-off-by: Jelmer Vernooij <jelmer@samba.org> Autobuild-User(master): Jelmer Vernooij <jelmer@samba.org> Autobuild-Date(master): Thu Sep 27 04:35:33 CEST 2012 on sn-devel-104
-rw-r--r--source4/scripting/python/samba/netcmd/domain.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py
index 43e92599fe..ba4165ac06 100644
--- a/source4/scripting/python/samba/netcmd/domain.py
+++ b/source4/scripting/python/samba/netcmd/domain.py
@@ -269,6 +269,8 @@ class cmd_domain_provision(Command):
suggested_forwarder = dns_forwarder
else:
suggested_forwarder = self._get_nameserver_ip()
+ if suggested_forwarder is None:
+ suggested_forwarder = "none"
if len(self.raw_argv) == 1:
interactive = True