[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-75-g36578b2

[Günther Deschner]

The branch, v3-2-test has been updated
       via  36578b22f12a7de21df5a795d7702c10d19b1f3d (commit)
      from  9cb1937fe8601e526b5c924930500e0a3b52abd5 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 36578b22f12a7de21df5a795d7702c10d19b1f3d
Author: Günther Deschner <gd at samba.org>
Date:   Fri Oct 19 13:03:44 2007 +0200

    Merge Tridge's fix for the winbind 32/64bit padding.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source/nsswitch/winbind_struct_protocol.h |    2 +-
 source/winbindd/winbindd.c                |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/nsswitch/winbind_struct_protocol.h b/source/nsswitch/winbind_struct_protocol.h
index d8e5c2f..0e3ad8b 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 057790a..d5f24d7 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;
 	}


-- 
Samba Shared Repository