sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-27 14:04:05 +03:00
Code

s4:drsuapi: always use the current uptodateness_vector

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Stefan Metzmacher 2012-12-17 16:34:25 +01:00
parent 025c6d62f3
commit 02de5b140c
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source4/rpc_server/drsuapi/getncchanges.c
View File

@ -50,7 +50,6 @@ struct drsuapi_getncchanges_state {
uint32_t la_count;
bool la_sorted;
uint32_t la_idx;
struct drsuapi_DsReplicaCursorCtrEx *uptodateness_vector;
};
/*
@ -1730,14 +1729,6 @@ allowed:
site_res_cmp_dn_usn_order);
}
getnc_state->uptodateness_vector = talloc_steal(getnc_state, req10->uptodateness_vector);
if (getnc_state->uptodateness_vector) {
/* make sure its sorted */
TYPESAFE_QSORT(getnc_state->uptodateness_vector->cursors,
getnc_state->uptodateness_vector->count,
drsuapi_DsReplicaCursor_compare);
}
for (i=0; i < getnc_state->num_records; i++) {
getnc_state->guids[i] = changes[i].guid;
if (GUID_all_zero(&getnc_state->guids[i])) {
@ -1751,6 +1742,13 @@ allowed:
talloc_free(changes);
}
if (req10->uptodateness_vector) {
/* make sure its sorted */
TYPESAFE_QSORT(req10->uptodateness_vector->cursors,
req10->uptodateness_vector->count,
drsuapi_DsReplicaCursor_compare);
}
/* Prefix mapping */
schema = dsdb_get_schema(sam_ctx, mem_ctx);
if (!schema) {
@ -1852,7 +1850,7 @@ allowed:
schema, &session_key, getnc_state->min_usn,
req10->replica_flags,
req10->partial_attribute_set,
getnc_state->uptodateness_vector,
req10->uptodateness_vector,
req10->extended_op,
max_wait_reached);
if (!W_ERROR_IS_OK(werr)) {
@ -1866,7 +1864,7 @@ allowed:
msg,
&getnc_state->la_list,
&getnc_state->la_count,
getnc_state->uptodateness_vector);
req10->uptodateness_vector);
if (!W_ERROR_IS_OK(werr)) {
return werr;
}