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

diff --git a/source/nsswitch/winbindd.c b/source/nsswitch/winbindd.c
index 34f04adab2ec4400694813281c411b9d0e52953e..9bbc0f088b039dab52b993622f73496bd8e8a75b 100644 (file)
--- 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 b6c262e466799a3cf4c247d3a4de2c08ab541eb9..135849ae8fbdd9816d5be7e5746a79217e0f7feb 100644 (file)
--- 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;