diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-02-18 13:00:31 +1100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2013-03-04 08:33:33 +0100 |
| commit | 81cda856faf2a5efd38965fd4c3b1f5551ad94d9 (patch) | |
| tree | 4e140bc17a47f0a96d1e58ad695cb9bddf4d8c6b | |
| parent | 09b82d5fdc05a1f440aa96a690c202d4b0df134b (diff) | |
| download | samba-81cda856faf2a5efd38965fd4c3b1f5551ad94d9.tar.gz samba-81cda856faf2a5efd38965fd4c3b1f5551ad94d9.tar.bz2 samba-81cda856faf2a5efd38965fd4c3b1f5551ad94d9.zip | |
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 <metze@samba.org>
| -rwxr-xr-x | source4/scripting/bin/samba_upgradeprovision | 5 |
1 files changed, 1 insertions, 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) |