rpms/samba
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add 32/64bit padding fix for winbind.

Browse Source 
Guenther
This commit is contained in:
Guenther Deschner 2007-10-18 16:25:02 +00:00
parent 7413c609a6
commit 93d22c00e2
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
samba.spec
View File

@ -1,6 +1,6 @@
Summary: The Samba Suite of programs
Name: samba
Epoch: 0
Epoch: 1
Version: 3.2.0
Release: 0.pre1%{?dist}
License: GPLv3+ and LGPLv3+
@ -41,6 +41,7 @@ Patch107: samba-3.2.0pre1-grouppwd.patch
Patch110: samba-3.0.21pre1-smbspool.patch
Patch111: samba-3.0.13-smbclient.patch
Patch200: samba-3.0.25rc1-inotifiy.patch
Patch201: winbind-padding.patch
Requires(pre): samba-common = %{epoch}:%{version}-%{release}
@ -158,6 +159,7 @@ cp %{SOURCE11} packaging/Fedora/
%patch110 -p1 -b .smbspool
%patch111 -p1 -b .smbclient
%patch200 -p0 -b .inotify
%patch201 -p0 -b .winbind-padding
mv source/VERSION source/VERSION.orig
sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{release}\"/' < source/VERSION.orig > source/VERSION
@ -663,6 +665,9 @@ exit 0
#%{_includedir}/libmsrpc.h
%changelog
* Wed Oct 8 2007 Guenther Deschner <gdeschner@redhat.com> 3.2.0-1.pre1.fc9
- 32/64bit padding fix
* Wed Oct 8 2007 Simo Sorce <ssorce@redhat.com> 3.2.0-0.pre1.fc9
- New major relase, minor switched from 0 to 2
- License change, the code is now GPLv3+

26
winbind-padding.patch Normal file
View File

@ -0,0 +1,26 @@
--- source/winbindd/winbindd.c 2007-09-24 00:01:39 +0000
+++ source/winbindd/winbindd.c 2007-10-17 07:58:37 +0000
@@ -532,8 +532,8 @@
}
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;
}
--- source/nsswitch/winbind_struct_protocol.h 2007-04-20 23:12:49 +0000
+++ source/nsswitch/winbind_struct_protocol.h 2007-10-17 07:58:37 +0000
@@ -326,7 +326,7 @@
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;