s4-provision: do not skip setting the acls on sysvol

Autobuild-User(master): Matthieu Patou <mat@samba.org>
Autobuild-Date(master): Wed Oct  3 10:26:06 CEST 2012 on sn-devel-104

diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py
index be591ea25718fe81e3efdacdfceda3a53a26896c..a9ad086d2645d9a0dbad5184ef7e9c1ac94ca02e 100644 (file)
--- a/source4/scripting/python/samba/netcmd/domain.py
+++ b/source4/scripting/python/samba/netcmd/domain.py
@@ -398,7 +398,7 @@ class cmd_domain_provision(Command):
                   backend_type=ldap_backend_type,
                   ldapadminpass=ldapadminpass, ol_mmr_urls=ol_mmr_urls,
                   useeadb=eadb, next_rid=next_rid, lp=lp, use_ntvfs=use_ntvfs,
-                  use_rfc2307=use_rfc2307)
+                  use_rfc2307=use_rfc2307, skip_sysvolacl=False)
         except ProvisioningError, e:
             raise CommandError("Provision failed", e)
 

diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index c5b2037845e0e74b5d82e614eb0a09d4d8af4c86..f1da4db0549c1053744a7b18ffcd1a3ba60038ee 100644 (file)
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -1607,7 +1607,7 @@ def provision_fill(samdb, secrets_ldb, logger, names, paths,
                    invocationid=None, machinepass=None, ntdsguid=None,
                    dns_backend=None, dnspass=None,
                    serverrole=None, dom_for_fun_level=None,
-                   am_rodc=False, lp=None, use_ntvfs=False, skip_sysvolacl=True):
+                   am_rodc=False, lp=None, use_ntvfs=False, skip_sysvolacl=False):
     # create/adapt the group policy GUIDs
     # Default GUID for default policy are described at
     # "How Core Group Policy Works"
@@ -1649,6 +1649,8 @@ def provision_fill(samdb, secrets_ldb, logger, names, paths,
             setsysvolacl(samdb, paths.netlogon, paths.sysvol, paths.root_uid,
                          paths.wheel_gid, domainsid, names.dnsdomain,
                          names.domaindn, lp, use_ntvfs)
+        else:
+            print "Setting acl on sysvol skipped"
 
         secretsdb_self_join(secrets_ldb, domain=names.domain,
                 realm=names.realm, dnsdomain=names.dnsdomain,