samba-tool domain provision: DNS forwarder default
authorRicky Nance <ricky.nance@weaubleau.k12.mo.us>
Thu, 27 Sep 2012 00:24:40 +0000 (17:24 -0700)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 27 Sep 2012 02:35:33 +0000 (04:35 +0200)
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

source4/scripting/python/samba/netcmd/domain.py

index 43e92599fee5182e1f1423a6cb6808ecd9ddea57..ba4165ac0663e13b47c4c26bebb21de0cf4c79e1 100644 (file)
@@ -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