From: Bob Campbell Date: Thu, 26 Jan 2017 21:40:19 +0000 (+1300) Subject: drs_utils: use a given highwatermark and uptodateness_vector in replicate() X-Git-Tag: talloc-2.1.9~167 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc0c702f791c280a8142c8993ddd41bd356b2d21;p=thirdparty%2Fsamba.git drs_utils: use a given highwatermark and uptodateness_vector in replicate() Signed-off-by: Bob Campbell Reviewed-by: Andrew Bartlett Reviewed-by: Stefan Metzmacher Pair-programmed-with: Andrew Bartlett --- diff --git a/python/samba/drs_utils.py b/python/samba/drs_utils.py index 0c14a6300ca..e91a20b04b1 100644 --- a/python/samba/drs_utils.py +++ b/python/samba/drs_utils.py @@ -198,7 +198,7 @@ class drs_Replicate(object): def replicate(self, dn, source_dsa_invocation_id, destination_dsa_guid, schema=False, exop=drsuapi.DRSUAPI_EXOP_NONE, rodc=False, - replica_flags=None): + replica_flags=None, highwatermark=None, udv=None): '''replicate a single DN''' # setup for a GetNCChanges call @@ -208,11 +208,16 @@ class drs_Replicate(object): req8.source_dsa_invocation_id = source_dsa_invocation_id req8.naming_context = drsuapi.DsReplicaObjectIdentifier() req8.naming_context.dn = dn - req8.highwatermark = drsuapi.DsReplicaHighWaterMark() - req8.highwatermark.tmp_highest_usn = 0 - req8.highwatermark.reserved_usn = 0 - req8.highwatermark.highest_usn = 0 - req8.uptodateness_vector = None + + if highwatermark is not None: + req8.highwatermark = highwatermark + else: + req8.highwatermark = drsuapi.DsReplicaHighWaterMark() + req8.highwatermark.tmp_highest_usn = 0 + req8.highwatermark.reserved_usn = 0 + req8.highwatermark.highest_usn = 0 + + req8.uptodateness_vector = udv if replica_flags is not None: req8.replica_flags = replica_flags