rpms/samba/devel winbind-padding.patch, NONE, 1.1 samba.spec, 1.136, 1.137

[Guenther Deschner (gd)]

Author: gd

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13367

Modified Files:
	samba.spec 
Added Files:
	winbind-padding.patch 
Log Message:
Add 32/64bit padding fix for winbind.

Guenther


winbind-padding.patch:

--- NEW FILE winbind-padding.patch ---
--- 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;



Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- samba.spec	8 Oct 2007 21:13:15 -0000	1.136
+++ samba.spec	18 Oct 2007 16:25:02 -0000	1.137
@@ -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 @@
 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 @@
 %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 @@
 #%{_includedir}/libmsrpc.h
 
 %changelog
+* Wed Oct 8 2007 Guenther Deschner <gdeschner at redhat.com> 3.2.0-1.pre1.fc9
+- 32/64bit padding fix
+
 * Wed Oct 8 2007 Simo Sorce <ssorce at redhat.com> 3.2.0-0.pre1.fc9
 - New major relase, minor switched from 0 to 2
 - License change, the code is now GPLv3+