rpms/samba/F-7 samba-3.0.25a-misc-fix.patch, NONE, 1.1 samba.spec, 1.121, 1.122

[Simo Sorce (simo)]

Author: simo

Update of /cvs/pkgs/rpms/samba/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26680

Modified Files:
	samba.spec 
Added Files:
	samba-3.0.25a-misc-fix.patch 
Log Message:

Add a couple of important fixes.
These will be part of 3.0.26 but they are critical enough to warrant a new realease IMO



samba-3.0.25a-misc-fix.patch:

--- NEW FILE samba-3.0.25a-misc-fix.patch ---
Author: idra
Revision: r23356
Modified: source/lib/util_str.c /branches/SAMBA_3_0_25/source/lib/util_str.c /branches/SAMBA_3_0_26/source/lib/util_str.c
Added: 
Removed: 



We missed to add the 'c' character to the list of valid ones for
shell escaping.

I hate this kind of bugs more than how Jeremy hates off by ones :(

Simo.


Index: source/lib/util_str.c
===================================================================
--- source/lib/util_str.c	(revision 23355)
+++ source/lib/util_str.c	(revision 23356)
@@ -2622,7 +2622,7 @@
  of characters. UNIX charset format.
 *******************************************************************/
 
-#define INCLUDE_LIST "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabdefghijklmnopqrstuvwxyz_/ \t.,"
+#define INCLUDE_LIST "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_/ \t.,"
 #define INSIDE_DQUOTE_LIST "$`\n\"\\"
 
 char *escape_shell_string(const char *src)

-------------------------------------------------------------------
Author: jra
Revision: r23346
Modified: source/smbd/nttrans.c /branches/SAMBA_3_0_25/source/smbd/nttrans.c /branches/SAMBA_3_0_26/source/smbd/nttrans.c
Added: 
Removed: 


Fix offline caching with XP/Vista. It was an off-by-one
in storing the access mask. I shouldn't have made this
mistake. Damn. Fixes bug #4673.
Jeremy


Index: source/smbd/nttrans.c
===================================================================
--- source/smbd/nttrans.c	(revision 23345)
+++ source/smbd/nttrans.c	(revision 23346)
@@ -420,7 +420,7 @@
 	p += 4;
 
 	if (flags & EXTENDED_RESPONSE_REQUIRED) {
-		p += 26;
+		p += 25;
 		SIVAL(p,0,FILE_GENERIC_ALL);
 		/* 
 		 * For pipes W2K3 seems to return
@@ -950,7 +950,7 @@
 
 	if (flags & EXTENDED_RESPONSE_REQUIRED) {
 		uint32 perms = 0;
-		p += 26;
+		p += 25;
 		if (fsp->is_directory || can_write_to_file(conn, fname, &sbuf)) {
 			perms = FILE_GENERIC_ALL;
 		} else {
@@ -1035,7 +1035,7 @@
 	p += 4;
 	
 	if (flags & EXTENDED_RESPONSE_REQUIRED) {
-		p += 26;
+		p += 25;
 		SIVAL(p,0,FILE_GENERIC_ALL);
 		/* 
 		 * For pipes W2K3 seems to return
@@ -1631,7 +1631,7 @@
 
 	if (flags & EXTENDED_RESPONSE_REQUIRED) {
 		uint32 perms = 0;
-		p += 26;
+		p += 25;
 		if (fsp->is_directory || can_write_to_file(conn, fname, &sbuf)) {
 			perms = FILE_GENERIC_ALL;
 		} else {



Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-7/samba.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- samba.spec	29 May 2007 15:44:15 -0000	1.121
+++ samba.spec	5 Jun 2007 20:42:19 -0000	1.122
@@ -2,7 +2,7 @@
 Name: samba
 Epoch: 0
 Version: 3.0.25a
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.samba.org/
@@ -47,7 +47,7 @@
 #Patch113: samba-3.0.21-warnings.patch
 Patch200: samba-3.0.25rc1-inotifiy.patch
 Patch201: samba-3.0.25a-pam_smbpass.patch
-
+Patch202: samba-3.0.25a-misc-fix.patch
 
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
 Requires: pam >= 0:0.64
@@ -170,6 +170,7 @@
 #%patch113 -p1 -b .warnings
 %patch200 -p0 -b .inotify
 %patch201 -p0 -b .pam_smbpass
+%patch202 -p0 -b .misc_fix
 
 # crap
 rm -f examples/VFS/.cvsignore
@@ -631,6 +632,10 @@
 #%{_includedir}/libmsrpc.h
 
 %changelog
+* Tue Jun 5 2007 Simo Sorce <ssorce at redhat.com> 3.0.25a-3.fc7
+- fix offline support with XP/Vista from jra at samba.org
+- fix bug in one of the recent security patches
+
 * Tue May 29 2007 Günther Deschner <gdeschner at redhat.com>
 - fix pam_smbpass patch.