s4:provision: add "+dns" to server services if the dns backend is SAMBA_INTERNAL
authorMichael Adam <obnox@samba.org>
Sun, 8 Jan 2012 00:02:58 +0000 (01:02 +0100)
committerKai Blin <kai@samba.org>
Tue, 10 Jan 2012 20:17:45 +0000 (21:17 +0100)
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

source4/scripting/python/samba/provision/__init__.py

index 4f35f0d7f6a98916c7a755463ea5ef640836931c..295e272dd497b8e26685a0f36bbbd4ad54f0fb97 100644 (file)
@@ -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()