diff options
| author | Matthieu Patou <mat@matws.net> | 2012-10-02 14:30:25 -0700 |
|---|---|---|
| committer | Matthieu Patou <mat@samba.org> | 2012-10-03 10:26:06 +0200 |
| commit | c1677e3b2fe42de309459fd8f8b3bea48bca5055 (patch) | |
| tree | 1517b73f441db407873df40ecaac88d8b191fdf9 | |
| parent | dfd3c31a3f9eea96854b2d22574856368e86b245 (diff) | |
| download | samba-c1677e3b2fe42de309459fd8f8b3bea48bca5055.tar.gz samba-c1677e3b2fe42de309459fd8f8b3bea48bca5055.tar.bz2 samba-c1677e3b2fe42de309459fd8f8b3bea48bca5055.zip | |
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
| -rw-r--r-- | source4/scripting/python/samba/netcmd/domain.py | 2 | ||||
| -rw-r--r-- | source4/scripting/python/samba/provision/__init__.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py index be591ea257..a9ad086d26 100644 --- 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 c5b2037845..f1da4db054 100644 --- 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, |