[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2351-g687275c

Jeremy Allison jra at samba.org
Fri May 9 05:13:30 GMT 2008


The branch, v3-3-test has been updated
       via  687275cd532f8f8ad710acd222a0c76625da53c6 (commit)
      from  f487f742cb903a06fbf2be006ddc9ce9063339ed (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
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.

-----------------------------------------------------------------------

Summary of changes:
 source/lib/xfile.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

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;
 	


-- 
Samba Shared Repository


More information about the samba-cvs mailing list