diff options
| author | Günther Deschner <gd@samba.org> | 2007-10-19 13:03:44 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2007-10-19 13:03:49 +0200 |
| commit | 61e482cfdfec09ed01225320ba6a4acd47081f63 (patch) | |
| tree | 1b29b0fa1ac68b61388f5c639f04546c5a2b3cf5 | |
| parent | 7f82fbad50906866bbb6c0950795644f1c18b099 (diff) | |
| download | samba-61e482cfdfec09ed01225320ba6a4acd47081f63.tar.gz samba-61e482cfdfec09ed01225320ba6a4acd47081f63.tar.bz2 samba-61e482cfdfec09ed01225320ba6a4acd47081f63.zip | |
Merge Tridge's fix for the winbind 32/64bit padding.
Guenther
(This used to be commit 36578b22f12a7de21df5a795d7702c10d19b1f3d)
| -rw-r--r-- | source3/nsswitch/winbind_struct_protocol.h | 2 | ||||
| -rw-r--r-- | source3/winbindd/winbindd.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/nsswitch/winbind_struct_protocol.h b/source3/nsswitch/winbind_struct_protocol.h index d8e5c2f3b8..0e3ad8bcaf 100644 --- a/source3/nsswitch/winbind_struct_protocol.h +++ b/source3/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/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c index 057790a541..d5f24d7aa2 100644 --- a/source3/winbindd/winbindd.c +++ b/source3/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; } |