rpms/samba/devel samba-3.2.0pre3-smbclient.diff, NONE, 1.1 samba.spec, 1.149, 1.150

[Guenther Deschner (gd)]

Author: gd

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

Modified Files:
	samba.spec 
Added Files:
	samba-3.2.0pre3-smbclient.diff 
Log Message:
Add smbclient fix (BZO #5452)

Guenther


samba-3.2.0pre3-smbclient.diff:

--- NEW FILE samba-3.2.0pre3-smbclient.diff ---
commit 687275cd532f8f8ad710acd222a0c76625da53c6
Author: Jeremy Allison <jra at samba.org>
Date:   Thu May 8 22:07:35 2008 -0700

    Fix bug #5452 - smbclient put always creates zero length
    files. Thanks to Kai Engert <kengert at redhat.com> for
    reporting.
    Jeremy.

diff --git a/source/lib/xfile.c b/source/lib/xfile.c
index d20a95b..e44a92d 100644
--- a/source/lib/xfile.c
+++ b/source/lib/xfile.c
@@ -263,13 +263,13 @@ int x_fflush(XFILE *f)
 
 	if (f->flags & X_FLAG_ERROR) return -1;
 
+	if (f->bufused == 0 || !f->buf) return 0;
+
 	if ((f->open_flags & O_ACCMODE) != O_WRONLY) {
 		errno = EINVAL;
 		return -1;
 	}
 
-	if (f->bufused == 0 || !f->buf) return 0;
-
 	ret = write(f->fd, f->buf, f->bufused);
 	if (ret == -1) return -1;
 	


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- samba.spec	25 Apr 2008 19:15:20 -0000	1.149
+++ samba.spec	9 May 2008 23:08:06 -0000	1.150
@@ -1,4 +1,4 @@
-%define main_release 9
+%define main_release 10
 %define samba_version 3.2.0pre3
 %define tdb_version 1.1.1
 %define talloc_version 1.2.0
@@ -47,6 +47,7 @@
 Patch111: samba-3.0.13-smbclient.patch
 Patch200: samba-3.0.25rc1-inotifiy.patch
 Patch207: samba-3.2.0pre2-roreloc.diff
+Patch208: samba-3.2.0pre3-smbclient.diff
 
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
 Requires: pam >= 0:0.64
@@ -254,6 +255,7 @@
 #%patch111 -p1 -b .smbclient # FIXME: does not apply
 #%patch200 -p0 -b .inotify # FIXME: does not compile
 %patch207 -p1 -b .roreloc
+%patch208 -p1 -b .smbclient
 
 mv source/VERSION source/VERSION.orig
 sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{release}\"/' < source/VERSION.orig > source/VERSION
@@ -848,6 +850,9 @@
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Fri May 09 2008 Guenther Deschner <gdeschner at redhat.com> - 3.2.0-1.pre3.10
+- Add smbclient fix (BZO #5452)
+
 * Fri Apr 25 2008 Guenther Deschner <gdeschner at redhat.com> - 3.2.0-1.pre3.9
 - Update to 3.2.0pre3