From c89bc8394d1a8b64cb211346c1de7e382f738a9e Mon Sep 17 00:00:00 2001 From: Matthias Dieter Wallnöfer Date: Sun, 7 Nov 2010 18:51:43 +0100 Subject: s4:upgradeprovision - remove some "recalculate_sd" uses MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We need "recalculate_sd" only when no external "nTSecurityDescriptor" change is performed. Otherwise the recalculation is performed automatically. Autobuild-User: Matthias Dieter Wallnöfer Autobuild-Date: Sun Nov 7 18:52:42 UTC 2010 on sn-devel-104 --- source4/scripting/bin/upgradeprovision | 6 +++--- 1 file 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 -- cgit