summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Patou <mat@matws.net>2011-06-14 01:41:56 +0400
committerMatthieu Patou <mat@samba.org>2011-06-19 23:21:08 +0200
commitbc7b8fa108bf27f78c69f5aec3e408e59555c232 (patch)
treee552ecd388d13d838e10c3937494e54db8678729
parentf7a903ee8085bb041cae8fdf603997e66245f35f (diff)
downloadsamba-bc7b8fa108bf27f78c69f5aec3e408e59555c232.tar.gz
samba-bc7b8fa108bf27f78c69f5aec3e408e59555c232.tar.bz2
samba-bc7b8fa108bf27f78c69f5aec3e408e59555c232.zip
s4-upgradeprovision: ignore objectSid
-rwxr-xr-xsource4/scripting/bin/upgradeprovision5
1 files changed, 3 insertions, 2 deletions
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: