diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-01-24 21:26:55 +0000 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2006-01-24 21:26:55 +0000 |
| commit | 958e5b190884d2876e6d2e80a69d03b8f922c471 (patch) | |
| tree | 4fa3a92b52298797d6663b8b89d9b527b64204fc /source/wrepl_server/wrepl_out_push.c | |
| parent | 4e50cb77113e3547534c5e23b1f0594365dda2d5 (diff) | |
| download | samba-876b0fe9c6189ab34ca599d41470e8e9ba579efb.tar.gz samba-876b0fe9c6189ab34ca599d41470e8e9ba579efb.tar.xz samba-876b0fe9c6189ab34ca599d41470e8e9ba579efb.zip | |
r13121: Tag 4.0.0TP1samba-4.0.0tp1
Diffstat (limited to 'source/wrepl_server/wrepl_out_push.c')
| -rw-r--r-- | source/wrepl_server/wrepl_out_push.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/wrepl_server/wrepl_out_push.c b/source/wrepl_server/wrepl_out_push.c index 9c8c9fad8d5..a9a7826f00a 100644 --- a/source/wrepl_server/wrepl_out_push.c +++ b/source/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 maxVersionID) +static uint32_t wreplsrv_calc_change_count(struct wreplsrv_partner *partner, uint64_t seqnumber) { uint64_t tmp_diff = UINT32_MAX; /* catch an overflow */ - if (partner->push.maxVersionID > maxVersionID) { + if (partner->push.seqnumber > seqnumber) { goto done; } - tmp_diff = maxVersionID - partner->push.maxVersionID; + tmp_diff = seqnumber - partner->push.seqnumber; 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.maxVersionID = maxVersionID; + partner->push.seqnumber = seqnumber; 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_maxVersion(service->wins_db); + seqnumber = winsdb_get_seqnumber(service->wins_db); for (partner = service->partners; partner; partner = partner->next) { /* if it's not a push partner, go to the next partner */ |