From eee32cf9683dd60e5883826926913433dab87cb7 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 1 Feb 2013 10:27:19 +0100 Subject: [PATCH] TODO: samba_upgradeprovision: do not overwrite changed nTSecurityDescriptor values --- source4/scripting/bin/samba_upgradeprovision | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/source4/scripting/bin/samba_upgradeprovision b/source4/scripting/bin/samba_upgradeprovision index e2c57f2..a3b7002 100755 --- a/source4/scripting/bin/samba_upgradeprovision +++ b/source4/scripting/bin/samba_upgradeprovision @@ -987,6 +987,11 @@ def checkKeepAttributeWithMetadata(delta, att, message, reference, current, "so it's impossible to know if the difference" " cames from the modification or from a previous bug") dnNotToRecalculate.append(str(dn)) + elif not usn_in_range(int(attrUSN), usns.get(attInvId)): + message(CHANGESD, "But the SD has been changed after the last " + "provision or upgradeprovision. Current " + "usn: %d. Doing nothing" % (attrUSN)) + dnNotToRecalculate.append(str(dn)) else: dnToRecalculate.append(str(dn)) continue -- 1.7.9.5