Fix incorrect msDS-IntID handling

[Stefan Metzmacher]

Hi Andrew,

>>> A final version of these patches is in that repo. 
>>
>> I'm ignoring the python related patches, which are currently on
>> top...
>>
>>> 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
>> DRS,
>> +                    # 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 =
>> o.originating_change_time
>> +                    hash_att[att].originating_invocation_id =
>> o.originating_invocation_id
>> +                    hash_att[att].originating_usn =
>> o.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
>> be
>> in the "dbcheck: Fix incorrect/duplicate attrid in
>> replPropertMetaData"
>> commit?
> 
> It is the test for that change. 
> 
>> Or can they be part of the "selftest: Update release-4-1-0rc3 with
>> more
>> test records"
>> commit?
> 
> 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.

Ok.

metze

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: OpenPGP digital signature
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160106/e747a327/signature.sig>