Rev 648: the auth arm of this union is now 1796 bytes long. This broken x86_64 in http://samba.org/~tridge/3_0-ctdb

[tridge at samba.org]

------------------------------------------------------------
revno: 648
revision-id: tridge at samba.org-20071017075837-4z293tkcwbygyeuf
parent: tridge at samba.org-20071017064738-837wl3137a1h278b
committer: Andrew Tridgell <tridge at samba.org>
branch nick: s3-ctdb-tridge
timestamp: Wed 2007-10-17 17:58:37 +1000
message:
  the auth arm of this union is now 1796 bytes long. This broken x86_64
modified:
  source/nsswitch/winbindd.c     winbindd.c-20070210173807-1wjifrbwaz6xnmgl-735
  source/nsswitch/winbindd_nss.h winbindd_nss.h-20070210173807-1wjifrbwaz6xnmgl-747
=== modified file 'source/nsswitch/winbindd.c'
--- a/source/nsswitch/winbindd.c	2007-09-24 00:01:39 +0000
+++ b/source/nsswitch/winbindd.c	2007-10-17 07:58:37 +0000
@@ -532,8 +532,8 @@
 	}
 
 	if (*(uint32 *)(&state->request) != sizeof(state->request)) {
-		DEBUG(0,("request_len_recv: Invalid request size received: %d\n",
-			 *(uint32 *)(&state->request)));
+		DEBUG(0,("request_len_recv: Invalid request size received: %d (expected %d)\n",
+			 *(uint32 *)(&state->request), sizeof(state->request)));
 		state->finished = True;
 		return;
 	}

=== modified file 'source/nsswitch/winbindd_nss.h'
--- a/source/nsswitch/winbindd_nss.h	2007-04-20 23:12:49 +0000
+++ b/source/nsswitch/winbindd_nss.h	2007-10-17 07:58:37 +0000
@@ -326,7 +326,7 @@
 		   The size is the sizeof the union without the padding aligned on 
 		   an 8 byte boundary.   --jerry */
 
-		char padding[1560];
+		char padding[1800];
 	} data;
 	union {
 		SMB_TIME_T padding;