rpms/samba/devel samba-3.2.0pre1-winbindd-padding.patch, NONE, 1.1 samba.spec, 1.137, 1.138 winbind-padding.patch, 1.1, NONE

[Simo Sorce (simo)]

Author: simo

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

Modified Files:
	samba.spec 
Added Files:
	samba-3.2.0pre1-winbindd-padding.patch 
Removed Files:
	winbind-padding.patch 
Log Message:

Fix release numbering
Fix changelog entry
Fix patch name to conform to the style used so far



samba-3.2.0pre1-winbindd-padding.patch:

--- NEW FILE samba-3.2.0pre1-winbindd-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.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- samba.spec	18 Oct 2007 16:25:02 -0000	1.137
+++ samba.spec	18 Oct 2007 16:36:16 -0000	1.138
@@ -1,8 +1,8 @@
 Summary: The Samba Suite of programs
 Name: samba
-Epoch: 1
+Epoch: 0
 Version: 3.2.0
-Release: 0.pre1%{?dist}
+Release: 0.pre1.1%{?dist}
 License: GPLv3+ and LGPLv3+
 Group: System Environment/Daemons
 URL: http://www.samba.org/
@@ -41,7 +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
+Patch201: samba-3.2.0pre1-winbindd-padding.patch
 
 
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
@@ -665,8 +665,8 @@
 #%{_includedir}/libmsrpc.h
 
 %changelog
-* Wed Oct 8 2007 Guenther Deschner <gdeschner at redhat.com> 3.2.0-1.pre1.fc9
-- 32/64bit padding fix
+* Thu Oct 18 2007 Guenther Deschner <gdeschner at redhat.com> 3.2.0-0.pre1.1.fc9
+- 32/64bit padding fix (affects multilib installations)
 
 * 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


--- winbind-padding.patch DELETED ---