[SCM] Samba Shared Repository - branch v3-0-test updated - initial-v3-0-unstable-30-g9acd56a

[Simo Sorce]

The branch, v3-0-test has been updated
       via  9acd56a247abdc1334fa011063940db6e0d65370 (commit)
      from  21e6405e0ca811fc5c74441c38f059ff41dc0c42 (commit)

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


- Log -----------------------------------------------------------------
commit 9acd56a247abdc1334fa011063940db6e0d65370
Author: Simo Sorce <idra at samba.org>
Date:   Tue Nov 20 18:19:54 2007 -0500

    32/64 bit compatibility fix
    this patch fixes platform where 32 and 64 bit apps can run at the same time
    fixed in and tested in Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=253036

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

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


Changeset truncated at 500 lines:

diff --git a/source/nsswitch/winbindd.c b/source/nsswitch/winbindd.c
index 34f04ad..9bbc0f0 100644
--- a/source/nsswitch/winbindd.c
+++ b/source/nsswitch/winbindd.c
@@ -540,8 +540,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 %d)\n",
+			 *(uint32 *)(&state->request), sizeof(state->request)));
 		state->finished = True;
 		return;
 	}
diff --git a/source/nsswitch/winbindd_nss.h b/source/nsswitch/winbindd_nss.h
index b6c262e..135849a 100644
--- a/source/nsswitch/winbindd_nss.h
+++ b/source/nsswitch/winbindd_nss.h
@@ -319,7 +319,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;


-- 
Samba Shared Repository