diff --git a/source/nsswitch/winbind_struct_protocol.h b/source/nsswitch/winbind_struct_protocol.h
index d8e5c2f3b8c..0e3ad8bcaf6 100644
--- a/source/nsswitch/winbind_struct_protocol.h
+++ b/source/nsswitch/winbind_struct_protocol.h
@@ -326,7 +326,7 @@ struct winbindd_request {
 		   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;
diff --git a/source/winbindd/winbindd.c b/source/winbindd/winbindd.c
index 057790a541b..d5f24d7aa2f 100644
--- a/source/winbindd/winbindd.c
+++ b/source/winbindd/winbindd.c
@@ -613,8 +613,8 @@ static void request_len_recv(void *private_data, bool success)
 	}
 
 	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 %u)\n",
+			 *(uint32_t *)(&state->request), (uint32_t)sizeof(state->request)));
 		state->finished = True;
 		return;
 	}