sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

Fix for bug #7233 - print fails with jobs >4GB from Win7 clients.

Browse Source 
Contains for by Sebastian Kloska <oncaphillis@snafu.de>. Submitter
confirms this fixes the problem.

Jeremy.
This commit is contained in:
Jeremy Allison 2010-03-30 15:27:26 -07:00
parent 4b249a616b
commit 32c8feab5d
3 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source3/include/proto.h
View File

@ -4919,6 +4919,7 @@ NTSTATUS print_fsp_open(struct smb_request *req, connection_struct *conn,
const char *fname,
uint16_t current_vuid, files_struct *fsp);
void print_fsp_end(files_struct *fsp, enum file_close_type close_type);
SMB_OFF_T printfile_offset(files_struct *fsp, SMB_OFF_T offset);
/* The following definitions come from printing/printing.c */

20
source3/printing/printfsp.c
View File

@ -114,3 +114,23 @@ void print_fsp_end(files_struct *fsp, enum file_close_type close_type)
print_job_end(SNUM(fsp->conn),jobid, close_type);
}
/****************************************************************************
Discovered by Sebastian Kloska <oncaphillis@snafu.de>. When print files
go beyond 4GB, the 32-bit offset sent in old SMBwrite calls is relative
to the current 4GB chunk we're writing to.
****************************************************************************/
SMB_OFF_T printfile_offset(files_struct *fsp, SMB_OFF_T offset)
{
SMB_STRUCT_STAT st;
if (sys_fstat(fsp->fh->fd, &st, false) == -1) {
DEBUG(3,("printfile_offset: sys_fstat failed on %s (%s)\n",
fsp_str_dbg(fsp),
strerror(errno) ));
return offset;
}
return (st.st_ex_size & 0xffffffff00000000LL) + offset;
}

16
source3/smbd/reply.c
View File

@ -3822,7 +3822,9 @@ void reply_writebraw(struct smb_request *req)
return;
}
if (!fsp->print_file) {
if (fsp->print_file) {
startpos = printfile_offset(fsp, startpos);
} else {
init_strict_lock_struct(fsp, (uint32)req->smbpid,
(uint64_t)startpos, (uint64_t)tcount, WRITE_LOCK,
&lock);
@ -4024,7 +4026,9 @@ 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 && !fsp->print_file) {
if (fsp->print_file) {
startpos = printfile_offset(fsp, startpos);
} else if (numtowrite) {
init_strict_lock_struct(fsp, (uint32)req->smbpid,
(uint64_t)startpos, (uint64_t)numtowrite, WRITE_LOCK,
&lock);
@ -4145,7 +4149,9 @@ void reply_write(struct smb_request *req)
startpos = IVAL_TO_SMB_OFF_T(req->vwv+2, 0);
data = (const char *)req->buf + 3;
if (!fsp->print_file) {
if (fsp->print_file) {
startpos = printfile_offset(fsp, startpos);
} else {
init_strict_lock_struct(fsp, (uint32)req->smbpid,
(uint64_t)startpos, (uint64_t)numtowrite, WRITE_LOCK,
&lock);
@ -4751,7 +4757,9 @@ 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 && !fsp->print_file) {
if (fsp->print_file) {
startpos = printfile_offset(fsp, startpos);
} else if (numtowrite) {
init_strict_lock_struct(fsp, (uint32)req->smbpid,
(uint64_t)startpos, (uint64_t)numtowrite, WRITE_LOCK,
&lock);