diff options
| author | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-11-07 18:51:43 +0100 |
|---|---|---|
| committer | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-11-07 18:52:42 +0000 |
| commit | c89bc8394d1a8b64cb211346c1de7e382f738a9e (patch) | |
| tree | 47e2c1558024fbc1a3c0e0d7fb35ce3c1b6a683e | |
| parent | 9057e603cf58b2fac5473df2999d6d0a704686b1 (diff) | |
| download | samba-c89bc8394d1a8b64cb211346c1de7e382f738a9e.tar.gz samba-c89bc8394d1a8b64cb211346c1de7e382f738a9e.tar.bz2 samba-c89bc8394d1a8b64cb211346c1de7e382f738a9e.zip | |
s4:upgradeprovision - remove some "recalculate_sd" uses
We need "recalculate_sd" only when no external "nTSecurityDescriptor" change
is performed. Otherwise the recalculation is performed automatically.
Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Sun Nov 7 18:52:42 UTC 2010 on sn-devel-104
| -rwxr-xr-x | source4/scripting/bin/upgradeprovision | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision index c4dcfbf774..dc81710ecd 100755 --- a/source4/scripting/bin/upgradeprovision +++ b/source4/scripting/bin/upgradeprovision @@ -1156,7 +1156,7 @@ def fix_partition_sd(samdb, names): descr = get_domain_descriptor(names.domainsid) delta["nTSecurityDescriptor"] = MessageElement(descr, FLAG_MOD_REPLACE, "nTSecurityDescriptor") - samdb.modify(delta, ["recalculate_sd:0"]) + samdb.modify(delta) # Then the config dn res = samdb.search(expression="objectClass=*", base=str(names.configdn), scope=SCOPE_BASE, attrs=["dn", "whenCreated"], @@ -1166,7 +1166,7 @@ def fix_partition_sd(samdb, names): descr = get_config_descriptor(names.domainsid) delta["nTSecurityDescriptor"] = MessageElement(descr, FLAG_MOD_REPLACE, "nTSecurityDescriptor" ) - samdb.modify(delta, ["recalculate_sd:0"]) + samdb.modify(delta) # Then the schema dn res = samdb.search(expression="objectClass=*", base=str(names.schemadn), scope=SCOPE_BASE, attrs=["dn", "whenCreated"], @@ -1177,7 +1177,7 @@ def fix_partition_sd(samdb, names): descr = get_schema_descriptor(names.domainsid) delta["nTSecurityDescriptor"] = MessageElement(descr, FLAG_MOD_REPLACE, "nTSecurityDescriptor" ) - samdb.modify(delta, ["recalculate_sd:0"]) + samdb.modify(delta) def rebuild_sd(samdb, names): """Rebuild security descriptor of the current provision from scratch |