diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-09-12 13:19:53 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-09-12 13:19:53 +1000 |
| commit | 7bdae8bfba862a67720d53dcffbf77f6b93ceeb4 (patch) | |
| tree | 4f92bc1e8a29a8a40f67cfcd77f02908a388ca16 /source4/rpc_server | |
| parent | fe36b8af64195f10acead12d4a4f426cc8772a8c (diff) | |
| parent | a8ab1e2570ac2a2e772295cd0cc46b7e60398043 (diff) | |
| download | samba-7bdae8bfba862a67720d53dcffbf77f6b93ceeb4.tar.gz samba-7bdae8bfba862a67720d53dcffbf77f6b93ceeb4.tar.bz2 samba-7bdae8bfba862a67720d53dcffbf77f6b93ceeb4.zip | |
Merge branch 'master' of /home/tridge/samba/git/combined
Diffstat (limited to 'source4/rpc_server')
| -rw-r--r-- | source4/rpc_server/drsuapi/getncchanges.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/source4/rpc_server/drsuapi/getncchanges.c b/source4/rpc_server/drsuapi/getncchanges.c index 725a380f89..4dce07e24a 100644 --- a/source4/rpc_server/drsuapi/getncchanges.c +++ b/source4/rpc_server/drsuapi/getncchanges.c @@ -315,8 +315,8 @@ WERROR dcesrv_drsuapi_DsGetNCChanges(struct dcesrv_call_state *dce_call, TALLOC_ ncRoot_dn = ldb_dn_new(mem_ctx, sam_ctx, ncRoot->dn); ret = drsuapi_search_with_extended_dn(sam_ctx, mem_ctx, &site_res, ncRoot_dn, LDB_SCOPE_SUBTREE, attrs, - "(&(uSNChanged>=%llu)(objectClass=*))", - (unsigned long long)r->in.req->req8.highwatermark.highest_usn); + "uSNChanged>=%llu", + (unsigned long long)(r->in.req->req8.highwatermark.highest_usn+1)); if (ret != LDB_SUCCESS) { return WERR_DS_DRA_INTERNAL_ERROR; } @@ -363,6 +363,7 @@ WERROR dcesrv_drsuapi_DsGetNCChanges(struct dcesrv_call_state *dce_call, TALLOC_ uSN = ldb_msg_find_attr_as_int(site_res->msgs[i], "uSNChanged", -1); if (uSN > r->out.ctr->ctr6.new_highwatermark.highest_usn) { + r->out.ctr->ctr6.new_highwatermark.tmp_highest_usn = uSN; r->out.ctr->ctr6.new_highwatermark.highest_usn = uSN; } @@ -390,9 +391,13 @@ WERROR dcesrv_drsuapi_DsGetNCChanges(struct dcesrv_call_state *dce_call, TALLOC_ } - DEBUG(4,("DsGetNSChanges with uSNChanged >= %llu on %s gave %u objects\n", - (unsigned long long)r->in.req->req8.highwatermark.highest_usn, + DEBUG(4,("DsGetNCChanges with uSNChanged >= %llu on %s gave %u objects\n", + (unsigned long long)(r->in.req->req8.highwatermark.highest_usn+1), ncRoot->dn, r->out.ctr->ctr6.object_count)); + if (r->out.ctr->ctr6.object_count <= 10 && DEBUGLVL(6)) { + NDR_PRINT_FUNCTION_DEBUG(drsuapi_DsGetNCChanges, NDR_IN|NDR_OUT, r); + } + return WERR_OK; } |