From bc7b8fa108bf27f78c69f5aec3e408e59555c232 Mon Sep 17 00:00:00 2001
From: Matthieu Patou <mat@matws.net>
Date: Tue, 14 Jun 2011 01:41:56 +0400
Subject: s4-upgradeprovision: ignore objectSid

---
 source4/scripting/bin/upgradeprovision | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision
index e2d5cb0fb8..bf06a3c4f7 100755
--- a/source4/scripting/bin/upgradeprovision
+++ b/source4/scripting/bin/upgradeprovision
@@ -882,9 +882,10 @@ def checkKeepAttributeWithMetadata(delta, att, message, reference, current,
     dn = current[0].dn
 
     for att in list(delta):
-        if att == "dn":
-            # dn is not removable
+        if att in ["dn", "objectSid"]:
+            delta.remove(att)
             continue
+
         # We have updated by provision usn information so let's exploit
         # replMetadataProperties
         if att in forwardlinked:
-- 
cgit