From: Michael Adam Date: Sun, 8 Jan 2012 00:02:58 +0000 (+0100) Subject: s4:provision: add "+dns" to server services if the dns backend is SAMBA_INTERNAL X-Git-Tag: tevent-0.9.15~448 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=803dc389d1ade89708a3fedc91dd2c271f4a495b;p=thirdparty%2Fsamba.git s4:provision: add "+dns" to server services if the dns backend is SAMBA_INTERNAL Signed-off-by: Kai Blin Autobuild-User: Kai Blin Autobuild-Date: Tue Jan 10 21:17:45 CET 2012 on sn-devel-104 --- diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py index 4f35f0d7f6a..295e272dd49 100644 --- a/source4/scripting/python/samba/provision/__init__.py +++ b/source4/scripting/python/samba/provision/__init__.py @@ -1593,6 +1593,10 @@ def provision(logger, session_info, credentials, smbconf=None, if not os.path.exists(os.path.dirname(smbconf)): os.makedirs(os.path.dirname(smbconf)) + server_services = None + if dns_backend == "SAMBA_INTERNAL": + server_services = [ "+dns" ] + # only install a new smb.conf if there isn't one there already if os.path.exists(smbconf): # if Samba Team members can't figure out the weird errors @@ -1603,10 +1607,11 @@ def provision(logger, session_info, credentials, smbconf=None, if data is None or data == "": make_smbconf(smbconf, hostname, domain, realm, serverrole, targetdir, sid_generator, useeadb, - lp=lp) + lp=lp, server_services=server_services) else: make_smbconf(smbconf, hostname, domain, realm, serverrole, - targetdir, sid_generator, useeadb, lp=lp) + targetdir, sid_generator, useeadb, lp=lp, + server_services=server_services) if lp is None: lp = samba.param.LoadParm()