From 81cda856faf2a5efd38965fd4c3b1f5551ad94d9 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 18 Feb 2013 13:00:31 +1100 Subject: samba_upgradeprovision: Remove alwaysRecalculate, this is too dangerous I am unclear on why this was added, but the idea that we ever always reset data in the directory is not reasonable to me, so I am removing it. Andrew Bartlett Reviewed-by: Stefan Metzmacher --- source4/scripting/bin/samba_upgradeprovision | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/source4/scripting/bin/samba_upgradeprovision b/source4/scripting/bin/samba_upgradeprovision index 0eacf1d6d6..6b5df1e201 100755 --- a/source4/scripting/bin/samba_upgradeprovision +++ b/source4/scripting/bin/samba_upgradeprovision @@ -1226,9 +1226,6 @@ def fix_wellknown_sd(samdb, names): :param samdb: An LDB object pointing to the sam of the current provision :param names: A list of key provision parameters """ - alwaysRecalculate = False - if len(dnToRecalculate) == 0 and len(dnNotToRecalculate) == 0: - alwaysRecalculate = True list_wellknown_dns = [] @@ -1287,7 +1284,7 @@ def fix_wellknown_sd(samdb, names): for [dn, descriptor_fn] in subcontainers: list_wellknown_dns.append(dn) - if alwaysRecalculate or dn in dnToRecalculate: + if dn in dnToRecalculate: delta = Message() delta.dn = Dn(samdb, str(dn)) descr = descriptor_fn(names.domainsid, name_map=names.name_map) -- cgit