[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-2290-gf409b00

[Jeremy Allison]

The branch, master has been updated
       via  f409b00dc7100bfd574848a4d3ebd04ef3825baf (commit)
      from  808721f7bb8c87fd80f60054cca1ef202d6c403a (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit f409b00dc7100bfd574848a4d3ebd04ef3825baf
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Jun 12 13:55:18 2009 -0700

    Check for error in transfer_file return also.
    Jeremy.

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

Summary of changes:
 source3/smbd/close.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index bc54bac..760a2d5 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -106,7 +106,13 @@ static NTSTATUS check_magic(struct files_struct *fsp)
 		return map_nt_error_from_unix(err);
 	}
 
-	transfer_file(tmp_fd,outfd,(SMB_OFF_T)st.st_ex_size);
+	if (transfer_file(tmp_fd,outfd,(SMB_OFF_T)st.st_ex_size) == (SMB_OFF_T)-1) {
+		int err = errno;
+		close(tmp_fd);
+		close(outfd);
+		TALLOC_FREE(ctx);
+		return map_nt_error_from_unix(err);
+	}
 	close(tmp_fd);
 	if (close(outfd) == -1) {
 		TALLOC_FREE(ctx);


-- 
Samba Shared Repository