diff options
| author | Matthieu Patou <mat@matws.net> | 2011-06-19 00:02:03 +0400 |
|---|---|---|
| committer | Matthieu Patou <mat@samba.org> | 2011-06-19 23:21:08 +0200 |
| commit | 4305f54b8ef9fdcc1ca075b991e9dadab4b485c7 (patch) | |
| tree | c20c50f6f61e55992e238a6c6b8244911a41088b | |
| parent | 01758595e3c01751f259e5b2edaf07beb982ed76 (diff) | |
| download | samba-4305f54b8ef9fdcc1ca075b991e9dadab4b485c7.tar.gz samba-4305f54b8ef9fdcc1ca075b991e9dadab4b485c7.tar.bz2 samba-4305f54b8ef9fdcc1ca075b991e9dadab4b485c7.zip | |
s4-upgradeprovision: fix inverted logic and wrong flags on sd_flags control
| -rwxr-xr-x | source4/scripting/bin/upgradeprovision | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision index 735757aa2c..b49ccf91c0 100755 --- a/source4/scripting/bin/upgradeprovision +++ b/source4/scripting/bin/upgradeprovision @@ -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: |