r13111: w2k3 uses the naxVersion id for calculating the notification,

so we do now

metze
(This used to be commit e48a47aa650781ebe79425f41eee925f358ceb96)

diff --git a/source4/wrepl_server/wrepl_out_push.c b/source4/wrepl_server/wrepl_out_push.c
index a9a7826f00a9034fc220a30d8b0ac34a4ccda15e..9c8c9fad8d5e5706496ee1fc4e1e8b4997a6b119 100644 (file)
--- a/source4/wrepl_server/wrepl_out_push.c
+++ b/source4/wrepl_server/wrepl_out_push.c
@@ -96,16 +96,16 @@ nomem:
        return;
 }
 
-static uint32_t wreplsrv_calc_change_count(struct wreplsrv_partner *partner, uint64_t seqnumber)
+static uint32_t wreplsrv_calc_change_count(struct wreplsrv_partner *partner, uint64_t maxVersionID)
 {
        uint64_t tmp_diff = UINT32_MAX;
 
        /* catch an overflow */
-       if (partner->push.seqnumber > seqnumber) {
+       if (partner->push.maxVersionID > maxVersionID) {
                goto done;
        }
 
-       tmp_diff = seqnumber - partner->push.seqnumber;
+       tmp_diff = maxVersionID - partner->push.maxVersionID;
 
        if (tmp_diff > UINT32_MAX) {
                tmp_diff = UINT32_MAX;
@@ -113,7 +113,7 @@ static uint32_t wreplsrv_calc_change_count(struct wreplsrv_partner *partner, uin
        }
 
 done:
-       partner->push.seqnumber = seqnumber;
+       partner->push.maxVersionID = maxVersionID;
        return (uint32_t)(tmp_diff & UINT32_MAX);
 }
 
@@ -123,7 +123,7 @@ NTSTATUS wreplsrv_out_push_run(struct wreplsrv_service *service)
        uint64_t seqnumber;
        uint32_t change_count;
 
-       seqnumber = winsdb_get_seqnumber(service->wins_db);
+       seqnumber = winsdb_get_maxVersion(service->wins_db);
 
        for (partner = service->partners; partner; partner = partner->next) {
                /* if it's not a push partner, go to the next partner */

diff --git a/source4/wrepl_server/wrepl_server.h b/source4/wrepl_server/wrepl_server.h
index bcf6f8ac48d382492844dd5fba6396a139de3212..c8dfcc64bd8a3d263173b59e455551cc01803943 100644 (file)
--- a/source4/wrepl_server/wrepl_server.h
+++ b/source4/wrepl_server/wrepl_server.h
@@ -165,8 +165,8 @@ struct wreplsrv_partner {
                /* change count till push notification */
                uint32_t change_count;
 
-               /* the last wins db seqnumber we know about */
-               uint64_t seqnumber;
+               /* the last wins db maxVersion have reported to the partner */
+               uint64_t maxVersionID;
 
                /* we should use WREPL_REPL_INFORM* messages to this partner */
                BOOL use_inform;