Attachment 5534 Details for Bug 7233 – git-am format patch for 3.5.2.

[patch] git-am format patch for 3.5.2.

0001-Fix-bug-7233-print-fails-with-jobs-4GB-from-Win7-cli.patch (text/plain), 5.88 KB, created by Jeremy Allison on 2010-03-24 14:59:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2010-03-24 14:59:53 UTC

Size: 5.88 KB

patch

obsolete

>From 51b80a39f5225bd535c9f8bd171b75ff9e907607 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Wed, 24 Mar 2010 12:47:01 -0700
>Subject: [PATCH] Fix bug #7233 - print fails with jobs >4GB from Win7 clients.
>
>Ensure we always write at end-of-file for older write calls.
>
>Jeremy.
>(cherry picked from commit 66b7fcc8ef6b43c219dcae43a68d861cf71b80fa)
>---
> source3/smbd/reply.c |   78 ++++++++++++++++++++++++++++++++++----------------
> 1 files changed, 53 insertions(+), 25 deletions(-)
>
>diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
>index 8d40ed6..d3cb7f1 100644
>--- a/source3/smbd/reply.c
>+++ b/source3/smbd/reply.c
>@@ -3763,6 +3763,11 @@ void reply_writebraw(struct smb_request *req)
> 	startpos = IVAL_TO_SMB_OFF_T(req->vwv+3, 0);
> 	write_through = BITSETW(req->vwv+7,0);
> 
>+	if (fsp->print_file) {
>+		/* Print files ignore the offset - use end of file. */
>+		startpos = (SMB_OFF_T)-1;
>+	}
>+
> 	/* We have to deal with slightly different formats depending
> 		on whether we are using the core+ or lanman1.0 protocol */
> 
>@@ -3782,15 +3787,17 @@ void reply_writebraw(struct smb_request *req)
> 		return;
> 	}
> 
>-	init_strict_lock_struct(fsp, (uint32)req->smbpid,
>-	    (uint64_t)startpos, (uint64_t)tcount, WRITE_LOCK,
>-	    &lock);
>+	if (!fsp->print_file) {
>+		init_strict_lock_struct(fsp, (uint32)req->smbpid,
>+		    (uint64_t)startpos, (uint64_t)tcount, WRITE_LOCK,
>+		    &lock);
> 
>-	if (!SMB_VFS_STRICT_LOCK(conn, fsp, &lock)) {
>-		reply_nterror(req, NT_STATUS_FILE_LOCK_CONFLICT);
>-		error_to_writebrawerr(req);
>-		END_PROFILE(SMBwritebraw);
>-		return;
>+		if (!SMB_VFS_STRICT_LOCK(conn, fsp, &lock)) {
>+			reply_nterror(req, NT_STATUS_FILE_LOCK_CONFLICT);
>+			error_to_writebrawerr(req);
>+			END_PROFILE(SMBwritebraw);
>+			return;
>+		}
> 	}
> 
> 	if (numtowrite>0) {
>@@ -3869,7 +3876,11 @@ void reply_writebraw(struct smb_request *req)
> 			exit_server_cleanly("secondary writebraw failed");
> 		}
> 
>-		nwritten = write_file(req,fsp,buf+4,startpos+nwritten,numtowrite);
>+		if (fsp->print_file) {
>+			nwritten = write_file(req,fsp,buf+4,(SMB_OFF_T)-1,numtowrite);
>+		} else {
>+			nwritten = write_file(req,fsp,buf+4,startpos+nwritten,numtowrite);
>+		}
> 		if (nwritten == -1) {
> 			TALLOC_FREE(buf);
> 			reply_nterror(req, map_nt_error_from_unix(errno));
>@@ -3904,7 +3915,9 @@ void reply_writebraw(struct smb_request *req)
> 		fsp->fnum, (double)startpos, (int)numtowrite,
> 		(int)total_written));
> 
>-	SMB_VFS_STRICT_UNLOCK(conn, fsp, &lock);
>+	if (!fsp->print_file) {
>+		SMB_VFS_STRICT_UNLOCK(conn, fsp, &lock);
>+	}
> 
> 	/* We won't return a status if write through is not selected - this
> 	 * follows what WfWg does */
>@@ -3928,7 +3941,9 @@ void reply_writebraw(struct smb_request *req)
> 	return;
> 
> strict_unlock:
>-	SMB_VFS_STRICT_UNLOCK(conn, fsp, &lock);
>+	if (!fsp->print_file) {
>+		SMB_VFS_STRICT_UNLOCK(conn, fsp, &lock);
>+	}
> 
> 	END_PROFILE(SMBwritebraw);
> 	return;
>@@ -3978,7 +3993,10 @@ void reply_writeunlock(struct smb_request *req)
> 	startpos = IVAL_TO_SMB_OFF_T(req->vwv+2, 0);
> 	data = (const char *)req->buf + 3;
> 
>-	if (numtowrite) {
>+	if (fsp->print_file) {
>+		/* Print files ignore the offset - use end of file. */
>+		startpos = (SMB_OFF_T)-1;
>+	} else if (numtowrite) {
> 		init_strict_lock_struct(fsp, (uint32)req->smbpid,
> 		    (uint64_t)startpos, (uint64_t)numtowrite, WRITE_LOCK,
> 		    &lock);
>@@ -4018,7 +4036,7 @@ void reply_writeunlock(struct smb_request *req)
> 		goto strict_unlock;
> 	}
> 
>-	if (numtowrite) {
>+	if (numtowrite && !fsp->print_file) {
> 		status = do_unlock(smbd_messaging_context(),
> 				fsp,
> 				req->smbpid,
>@@ -4040,7 +4058,7 @@ void reply_writeunlock(struct smb_request *req)
> 		 fsp->fnum, (int)numtowrite, (int)nwritten));
> 
> strict_unlock:
>-	if (numtowrite) {
>+	if (numtowrite && !fsp->print_file) {
> 		SMB_VFS_STRICT_UNLOCK(conn, fsp, &lock);
> 	}
> 
>@@ -4099,14 +4117,19 @@ void reply_write(struct smb_request *req)
> 	startpos = IVAL_TO_SMB_OFF_T(req->vwv+2, 0);
> 	data = (const char *)req->buf + 3;
> 
>-	init_strict_lock_struct(fsp, (uint32)req->smbpid,
>-	    (uint64_t)startpos, (uint64_t)numtowrite, WRITE_LOCK,
>-	    &lock);
>+	if (fsp->print_file) {
>+		/* Print files ignore the offset - use end of file. */
>+		startpos = (SMB_OFF_T)-1;
>+	} else {
>+		init_strict_lock_struct(fsp, (uint32)req->smbpid,
>+			(uint64_t)startpos, (uint64_t)numtowrite, WRITE_LOCK,
>+			&lock);
> 
>-	if (!SMB_VFS_STRICT_LOCK(conn, fsp, &lock)) {
>-		reply_nterror(req, NT_STATUS_FILE_LOCK_CONFLICT);
>-		END_PROFILE(SMBwrite);
>-		return;
>+		if (!SMB_VFS_STRICT_LOCK(conn, fsp, &lock)) {
>+			reply_nterror(req, NT_STATUS_FILE_LOCK_CONFLICT);
>+			END_PROFILE(SMBwrite);
>+			return;
>+		}
> 	}
> 
> 	/*
>@@ -4164,7 +4187,9 @@ void reply_write(struct smb_request *req)
> 	DEBUG(3,("write fnum=%d num=%d wrote=%d\n", fsp->fnum, (int)numtowrite, (int)nwritten));
> 
> strict_unlock:
>-	SMB_VFS_STRICT_UNLOCK(conn, fsp, &lock);
>+	if (!fsp->print_file) {
>+		SMB_VFS_STRICT_UNLOCK(conn, fsp, &lock);
>+	}
> 
> 	END_PROFILE(SMBwrite);
> 	return;
>@@ -4701,7 +4726,10 @@ void reply_writeclose(struct smb_request *req)
> 	mtime = convert_time_t_to_timespec(srv_make_unix_date3(req->vwv+4));
> 	data = (const char *)req->buf + 1;
> 
>-	if (numtowrite) {
>+	if (fsp->print_file) {
>+		/* Print files ignore the offset - use end of file. */
>+		startpos = (SMB_OFF_T)-1;
>+	} else if (numtowrite) {
> 		init_strict_lock_struct(fsp, (uint32)req->smbpid,
> 		    (uint64_t)startpos, (uint64_t)numtowrite, WRITE_LOCK,
> 		    &lock);
>@@ -4747,7 +4775,7 @@ void reply_writeclose(struct smb_request *req)
> 	SSVAL(req->outbuf,smb_vwv0,nwritten);
> 
> strict_unlock:
>-	if (numtowrite) {
>+	if (numtowrite && !fsp->print_file) {
> 		SMB_VFS_STRICT_UNLOCK(conn, fsp, &lock);
> 	}
> 
>@@ -5204,7 +5232,7 @@ void reply_printwrite(struct smb_request *req)
> 
> 	data = (const char *)req->buf + 3;
> 
>-	if (write_file(req,fsp,data,-1,numtowrite) != numtowrite) {
>+	if (write_file(req,fsp,data,(SMB_OFF_T)-1,numtowrite) != numtowrite) {
> 		reply_nterror(req, map_nt_error_from_unix(errno));
> 		END_PROFILE(SMBsplwr);
> 		return;
>-- 
>1.7.0.1
>

Actions: View

Attachments on bug 7233: 5487 | 5500 | 5525 | 5527 | 5528 | 5534 | 5535 | 5536 | 5542 | 5558 | 5563 | 5564