From 1edf050ad8682f2cd0781babf9b9db132e1e7493 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 19 Sep 2007 19:05:54 +0000 Subject: r25241: remove sequence_number out of WINBINDD_DOMAIN_INFO call as this is always answered by the winbindd parent and will most times return old sequence number values. metze (This used to be commit 9caf54c868e8c0109730860e772c9cc404e2f899) --- source3/nsswitch/wbinfo.c | 2 -- source3/nsswitch/winbind_struct_protocol.h | 2 +- source3/winbindd/winbindd_misc.c | 8 ++------ source3/winbindd/winbindd_util.c | 4 ---- 4 files changed, 3 insertions(+), 13 deletions(-) (limited to 'source3') diff --git a/source3/nsswitch/wbinfo.c b/source3/nsswitch/wbinfo.c index 45f27e7eb7..bd5c6392f1 100644 --- a/source3/nsswitch/wbinfo.c +++ b/source3/nsswitch/wbinfo.c @@ -468,8 +468,6 @@ static BOOL wbinfo_domain_info(const char *domain_name) d_printf("Primary : %s\n", response.data.domain_info.primary ? "Yes" : "No"); - d_printf("Sequence : %d\n", response.data.domain_info.sequence_number); - return True; } diff --git a/source3/nsswitch/winbind_struct_protocol.h b/source3/nsswitch/winbind_struct_protocol.h index 645534b836..d8e5c2f3b8 100644 --- a/source3/nsswitch/winbind_struct_protocol.h +++ b/source3/nsswitch/winbind_struct_protocol.h @@ -447,8 +447,8 @@ struct winbindd_response { bool native_mode; bool active_directory; bool primary; - uint32_t sequence_number; } domain_info; + uint32_t sequence_number; struct { fstring acct_name; fstring full_name; diff --git a/source3/winbindd/winbindd_misc.c b/source3/winbindd/winbindd_misc.c index 9c3f634534..1f23bf1bee 100644 --- a/source3/winbindd/winbindd_misc.c +++ b/source3/winbindd/winbindd_misc.c @@ -410,7 +410,7 @@ static void sequence_recv(void *private_data, BOOL success) uint32 seq = DOM_SEQUENCE_NONE; if ((success) && (state->response->result == WINBINDD_OK)) - seq = state->response->data.domain_info.sequence_number; + seq = state->response->data.sequence_number; if (seq == DOM_SEQUENCE_NONE) { state->extra_data = talloc_asprintf(state->mem_ctx, @@ -459,7 +459,7 @@ enum winbindd_result winbindd_dual_show_sequence(struct winbindd_domain *domain, domain->methods->sequence_number(domain, &domain->sequence_number); - state->response.data.domain_info.sequence_number = + state->response.data.sequence_number = domain->sequence_number; return WINBINDD_OK; @@ -519,8 +519,6 @@ void winbindd_domain_info(struct winbindd_cli_state *state) domain->active_directory; state->response.data.domain_info.primary = domain->primary; - state->response.data.domain_info.sequence_number = - domain->sequence_number; request_ok(state); } @@ -554,8 +552,6 @@ static void domain_info_init_recv(void *private_data, BOOL success) domain->active_directory; state->response.data.domain_info.primary = domain->primary; - state->response.data.domain_info.sequence_number = - domain->sequence_number; request_ok(state); } diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c index c1600823fc..0175990f0c 100644 --- a/source3/winbindd/winbindd_util.c +++ b/source3/winbindd/winbindd_util.c @@ -631,8 +631,6 @@ static void init_child_recv(void *private_data, BOOL success) state->response->data.domain_info.native_mode; state->domain->active_directory = state->response->data.domain_info.active_directory; - state->domain->sequence_number = - state->response->data.domain_info.sequence_number; init_dc_connection(state->domain); @@ -677,8 +675,6 @@ enum winbindd_result winbindd_dual_init_connection(struct winbindd_domain *domai = domain->active_directory; state->response.data.domain_info.primary = domain->primary; - state->response.data.domain_info.sequence_number = - domain->sequence_number; return WINBINDD_OK; } -- cgit