s4:scripting/python: always treat the highwatermark as opaque (bug #9508)

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit 257ae5443631e645842cfcc9c1cedce6c41d5afa)

diff --git a/source4/scripting/devel/getncchanges b/source4/scripting/devel/getncchanges
index 736e3db4400b73b2ac712e91b8c8f0354f7c9a24..d401c82869f16b283c0b9f1cda6c5dba74fc8918 100755 (executable)
--- a/source4/scripting/devel/getncchanges
+++ b/source4/scripting/devel/getncchanges
@@ -177,4 +177,4 @@ if __name__ == "__main__":
         nb_iter += 1
         if ctr.more_data == 0 or opts.nb_iter == nb_iter:
             break
-        req8.highwatermark.tmp_highest_usn = ctr.new_highwatermark.tmp_highest_usn
+        req8.highwatermark = ctr.new_highwatermark

diff --git a/source4/scripting/devel/repl_cleartext_pwd.py b/source4/scripting/devel/repl_cleartext_pwd.py
index 5eebc8689de59a284b929af279cb53981c062cea..9637d885e081e70e5116b9eedaaf586f47702197 100755 (executable)
--- a/source4/scripting/devel/repl_cleartext_pwd.py
+++ b/source4/scripting/devel/repl_cleartext_pwd.py
@@ -406,4 +406,4 @@ if __name__ == "__main__":
             print "# up to usn[%d]" % (ctr.new_highwatermark.highest_usn)
             break
         print "# up to tmp_usn[%d]" % (ctr.new_highwatermark.highest_usn)
-        req8.highwatermark.tmp_highest_usn = ctr.new_highwatermark.tmp_highest_usn
+        req8.highwatermark = ctr.new_highwatermark

diff --git a/source4/scripting/python/samba/drs_utils.py b/source4/scripting/python/samba/drs_utils.py
index 481eec2920256e8f82bca3c18d204756245e401b..6e2cfea9ab2385a7139822748e48ccf87234da79 100644 (file)
--- a/source4/scripting/python/samba/drs_utils.py
+++ b/source4/scripting/python/samba/drs_utils.py
@@ -252,4 +252,4 @@ class drs_Replicate(object):
                 schema=schema, req_level=req_level, req=req)
             if ctr.more_data == 0:
                 break
-            req.highwatermark.tmp_highest_usn = ctr.new_highwatermark.tmp_highest_usn
+            req.highwatermark = ctr.new_highwatermark