sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00
Code

s4-upgradeprovision: fix inverted logic and wrong flags on sd_flags control

Browse Source
This commit is contained in:
Matthieu Patou 2011-06-19 00:02:03 +04:00 committed by Matthieu Patou
parent 01758595e3
commit 4305f54b8e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source4/scripting/bin/upgradeprovision
View File

@ -872,7 +872,7 @@ def checkKeepAttributeWithMetadata(delta, att, message, reference, current,
:return: The modified message diff.
"""
global defSDmodified
isFirst = False
isFirst = True
txt = ""
dn = current[0].dn
@ -887,7 +887,7 @@ def checkKeepAttributeWithMetadata(delta, att, message, reference, current,
continue
if isFirst and len(delta.items())>1:
isFirst = True
isFirst = False
txt = "%s\n" % (str(dn))
keptAttr = ["dn", "rIDAvailablePool", "objectSid", "creationTime", "oEMInformation", "msDs-KeyVersionNumber"]
@ -930,6 +930,7 @@ def checkKeepAttributeWithMetadata(delta, att, message, reference, current,
message(CHANGE, "sd are identical")
else:
message(CHANGE, "sd are not identical")
if attrUSN == -1:
# This attribute was last modified by another DC forget
# about it
@ -993,7 +994,7 @@ def update_present(ref_samdb, samdb, basedn, listPresent, usns):
raise ProvisioningError(msg)
changed = 0
controls = ["search_options:1:2", "sd_flags:1:2"]
controls = ["search_options:1:2", "sd_flags:1:0"]
if usns is not None:
message(CHANGE, "Using replPropertyMetadata for change selection")
for dn in listPresent: