rpms/samba/FC-6 samba-3.0.24-CVE-2007-4572-regression.patch, 1.2, 1.3 samba.spec, 1.82, 1.83

[fedora-cvs-commits redhat com]

Author: ssorce

Update of /cvs/dist/rpms/samba/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv20486

Modified Files:
	samba-3.0.24-CVE-2007-4572-regression.patch samba.spec 
Log Message:
Missed yet one line fix


samba-3.0.24-CVE-2007-4572-regression.patch:
 negprot.c   |    2 +-
 reply.c     |    8 ++++----
 sesssetup.c |    6 +++---
 srvstr.c    |   13 +++----------
 trans2.c    |   48 ++++++++++++++++++++++++++----------------------
 5 files changed, 37 insertions(+), 40 deletions(-)

Index: samba-3.0.24-CVE-2007-4572-regression.patch
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-6/samba-3.0.24-CVE-2007-4572-regression.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- samba-3.0.24-CVE-2007-4572-regression.patch	4 Dec 2007 16:43:14 -0000	1.2
+++ samba-3.0.24-CVE-2007-4572-regression.patch	4 Dec 2007 16:50:03 -0000	1.3
@@ -184,7 +184,7 @@
  			p+= 8;
  
 -			len = srvstr_push(outbuf, p, fname, -1, STR_TERMINATE);
-+			len = srvstr_push(outbuf, p, fname, space_remaining - (p - pdata), STR_TERMINATE);
++			len = srvstr_push(outbuf, p, fname, PTR_DIFF(end_data, p), STR_TERMINATE);
  			p += len;
  			SIVAL(p,0,0); /* Ensure any padding is null. */
  


Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-6/samba.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- samba.spec	4 Dec 2007 16:43:14 -0000	1.82
+++ samba.spec	4 Dec 2007 16:50:03 -0000	1.83
@@ -3,7 +3,7 @@
 Summary: The Samba SMB server.
 Name: samba
 Version: 3.0.24
-Release: 10%{?dist}
+Release: 11%{?dist}
 Epoch: 0
 License: GNU GPL Version 2
 Group: System Environment/Daemons
@@ -478,7 +478,7 @@
 %{_mandir}/man7/libsmbclient.7*
 
 %changelog
-* Tue Dec 3 2007 Simo Sorce <ssorce redhat com> 3.0.24-10.fc6
+* Tue Dec 3 2007 Simo Sorce <ssorce redhat com> 3.0.24-11.fc6
 - The fix for the regression intorduced by CVE-2007-4572 was
   not complete, updated the patch with more fixes