The branch, v3-2-test has been updated
via f7982f573dd2d339fea50c1811a42816c7721279 (commit)
from 1ed49e94fea86bf919c3125b63e6b3daa9de450f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit f7982f573dd2d339fea50c1811a42816c7721279
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date: Thu May 8 22:07:27 2008 -0700
Fix bug #5452 - smbclient put always creates zero length
files. Thanks to Kai Engert <[EMAIL PROTECTED]> for
reporting.
Karolin - this is a showstopper and must be pulled
into 3.2-stable. Thanks !
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
