From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 1 Feb 2013 09:27:19 +0000 (+0100)
Subject: TODO: samba_upgradeprovision: do not overwrite changed nTSecurityDescriptor values
X-Git-Url: http://git.samba.org/?p=metze%2Fsamba%2Fwip.git;a=commitdiff_plain;h=fd507a2c1be1eec327ece90188d3ea2833bad0fd

TODO: samba_upgradeprovision: do not overwrite changed nTSecurityDescriptor values
---

diff --git a/source4/scripting/bin/samba_upgradeprovision b/source4/scripting/bin/samba_upgradeprovision
index 8433b4ddd9c6..5f2c22716640 100755
--- a/source4/scripting/bin/samba_upgradeprovision
+++ b/source4/scripting/bin/samba_upgradeprovision
@@ -907,6 +907,11 @@ def checkKeepAttributeWithMetadata(delta, att, message, reference, current,
                                     " cames from the modification or from a previous bug")
                     global dnNotToRecalculateFound
                     dnNotToRecalculateFound = True
+                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))
+                    dnNotToRecalculateFound = True
                 else:
                     dnToRecalculate.append(dn)
                 continue