Fix incorrect msDS-IntID handling
metze at samba.org
Tue Jan 5 23:06:53 UTC 2016
>>> A final version of these patches is in that repo.
>> I'm ignoring the python related patches, which are currently on
>>> Please review/push!
>> in err_replmetadata_incorrect_attid()
>> + if o.local_usn > hash_att[att].local_usn:
>> + # This is always what we would have sent over
>> + # because the DRS server will have sent the
>> + # msDS-IntID, but with the values from both
>> + # attribute entries.
>> + hash_att[att].version = o.version
>> + hash_att[att].originating_change_time =
>> + hash_att[att].originating_invocation_id =
>> + hash_att[att].originating_usn =
>> + hash_att[att].local_usn = o.local_usn
>> Should we have a "continue" here
>> otherwise it makes no sense if we always do "hash_att[att] = o"
>> + hash_att[att] = o
>> + set_att.add(att.lower())
> Well spotted. Thanks
In the branch you added the "continue" only within the
"if o.local_usn > hash_att[att].local_usn:" statement.
I guess we should remove 4 whitespaces and do it always
if hash_att[att] already exists.
>> In general are the source4/selftest/provisions/ changes required to
>> in the "dbcheck: Fix incorrect/duplicate attrid in
> It is the test for that change.
>> Or can they be part of the "selftest: Update release-4-1-0rc3 with
>> test records"
> I don't want anything extra in that commit, it is too large as it is
> and essentially impossible to review. Like we do ABI updates in their
> own commit, this belongs in it's own commit.
-------------- next part --------------
A non-text attachment was scrubbed...
Size: 836 bytes
Desc: OpenPGP digital signature
More information about the samba-technical