--- samba-3.0.26a/source/nsswitch/winbindd_nss.h.orig	2007-10-18 12:43:25.000000000 -0400
+++ samba-3.0.26a/source/nsswitch/winbindd_nss.h	2007-10-18 12:43:41.000000000 -0400
@@ -319,7 +319,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;
--- samba-3.0.26a/source/nsswitch/winbindd.c.orig	2007-10-18 12:44:24.000000000 -0400
+++ samba-3.0.26a/source/nsswitch/winbindd.c	2007-10-18 12:44:55.000000000 -0400
@@ -540,8 +540,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;
 	}