svn commit: samba r25241 - in branches/SAMBA_3_2/source: nsswitch winbindd

metze at samba.org metze at samba.org
Wed Sep 19 19:05:55 GMT 2007


Author: metze
Date: 2007-09-19 19:05:54 +0000 (Wed, 19 Sep 2007)
New Revision: 25241

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25241

Log:
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
Modified:
   branches/SAMBA_3_2/source/nsswitch/wbinfo.c
   branches/SAMBA_3_2/source/nsswitch/winbind_struct_protocol.h
   branches/SAMBA_3_2/source/winbindd/winbindd_misc.c
   branches/SAMBA_3_2/source/winbindd/winbindd_util.c


Changeset:
Modified: branches/SAMBA_3_2/source/nsswitch/wbinfo.c
===================================================================
--- branches/SAMBA_3_2/source/nsswitch/wbinfo.c	2007-09-19 19:03:01 UTC (rev 25240)
+++ branches/SAMBA_3_2/source/nsswitch/wbinfo.c	2007-09-19 19:05:54 UTC (rev 25241)
@@ -468,8 +468,6 @@
 	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;
 }
 

Modified: branches/SAMBA_3_2/source/nsswitch/winbind_struct_protocol.h
===================================================================
--- branches/SAMBA_3_2/source/nsswitch/winbind_struct_protocol.h	2007-09-19 19:03:01 UTC (rev 25240)
+++ branches/SAMBA_3_2/source/nsswitch/winbind_struct_protocol.h	2007-09-19 19:05:54 UTC (rev 25241)
@@ -447,8 +447,8 @@
 			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;

Modified: branches/SAMBA_3_2/source/winbindd/winbindd_misc.c
===================================================================
--- branches/SAMBA_3_2/source/winbindd/winbindd_misc.c	2007-09-19 19:03:01 UTC (rev 25240)
+++ branches/SAMBA_3_2/source/winbindd/winbindd_misc.c	2007-09-19 19:05:54 UTC (rev 25241)
@@ -410,7 +410,7 @@
 	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 @@
 
 	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 @@
 		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 @@
 		domain->active_directory;
 	state->response.data.domain_info.primary =
 		domain->primary;
-	state->response.data.domain_info.sequence_number =
-		domain->sequence_number;
 
 	request_ok(state);
 }

Modified: branches/SAMBA_3_2/source/winbindd/winbindd_util.c
===================================================================
--- branches/SAMBA_3_2/source/winbindd/winbindd_util.c	2007-09-19 19:03:01 UTC (rev 25240)
+++ branches/SAMBA_3_2/source/winbindd/winbindd_util.c	2007-09-19 19:05:54 UTC (rev 25241)
@@ -631,8 +631,6 @@
 		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 @@
 		= domain->active_directory;
 	state->response.data.domain_info.primary
 		= domain->primary;
-	state->response.data.domain_info.sequence_number =
-		domain->sequence_number;
 
 	return WINBINDD_OK;
 }



More information about the samba-cvs mailing list