git.samba.org
/
gd
/
samba-autobuild
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f7a903e
)
s4-upgradeprovision: ignore objectSid
author
Matthieu Patou
<mat@matws.net>
Mon, 13 Jun 2011 21:41:56 +0000
(
01:41
+0400)
committer
Matthieu Patou
<mat@samba.org>
Sun, 19 Jun 2011 21:21:08 +0000
(23:21 +0200)
source4/scripting/bin/upgradeprovision
patch
|
blob
|
history
diff --git
a/source4/scripting/bin/upgradeprovision
b/source4/scripting/bin/upgradeprovision
index e2d5cb0fb871c0093c445504795fd531ebd5d79b..bf06a3c4f7905c9b579bfa1cb79562d307717731 100755
(executable)
--- 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: