summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2012-01-08 01:02:58 +0100
committerKai Blin <kai@samba.org>2012-01-10 21:17:45 +0100
commit803dc389d1ade89708a3fedc91dd2c271f4a495b (patch)
treec7dfff5bebb4700c0a8d035faa6f3803347a00bb
parent83c149de4d7ba91f799959bc411516fd163917df (diff)
downloadsamba-803dc389d1ade89708a3fedc91dd2c271f4a495b.tar.gz
samba-803dc389d1ade89708a3fedc91dd2c271f4a495b.tar.bz2
samba-803dc389d1ade89708a3fedc91dd2c271f4a495b.zip
s4:provision: add "+dns" to server services if the dns backend is SAMBA_INTERNAL
Signed-off-by: Kai Blin <kai@samba.org> Autobuild-User: Kai Blin <kai@samba.org> Autobuild-Date: Tue Jan 10 21:17:45 CET 2012 on sn-devel-104
-rw-r--r--source4/scripting/python/samba/provision/__init__.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index 4f35f0d7f6..295e272dd4 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()