[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0pre2-394-g2ba0037

Karolin Seeger kseeger at samba.org
Wed Apr 2 06:11:33 GMT 2008


The branch, v3-2-stable has been updated
       via  2ba0037a3bb1e0692e5c35b11dd632590735d869 (commit)
       via  7ab5d6f0251ee1d10e9393911c2f120b94f784fe (commit)
       via  37aa01f033e6fdeb970d8357db6ea4498fe83d1f (commit)
      from  f8cc8e873508b358633dcdcf945b34587eef0950 (commit)

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


- Log -----------------------------------------------------------------
commit 2ba0037a3bb1e0692e5c35b11dd632590735d869
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Mar 28 17:32:52 2008 -0700

    Fix missing '&&'.
    Jeremy.
    (cherry picked from commit 251df53811e4272b629575a4b50c29a99715ccf9)

commit 7ab5d6f0251ee1d10e9393911c2f120b94f784fe
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Mar 28 17:31:06 2008 -0700

    Only allow sendfile on non-stream fsp's. Should fix make test for streams
    as sendfile isn't implemented in the streams vfs modules yet.
    Jeremy.
    (cherry picked from commit eef53e9603d4f3d892ffe00b061def5d717ca481)

commit 37aa01f033e6fdeb970d8357db6ea4498fe83d1f
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Mar 28 10:12:07 2008 -0700

    Fix bug #5326 - OS/2 servers give strange "high word" replies for print jobs.
    Jeremy.
    (cherry picked from commit d090d25cb702965b3d5e4635a26a06f2b62d235d)

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

Summary of changes:
 source/libsmb/clireadwrite.c |    4 +++-
 source/smbd/reply.c          |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libsmb/clireadwrite.c b/source/libsmb/clireadwrite.c
index 668a269..e79fd90 100644
--- a/source/libsmb/clireadwrite.c
+++ b/source/libsmb/clireadwrite.c
@@ -745,7 +745,9 @@ ssize_t cli_write(struct cli_state *cli,
 			break;
 
 		bwritten += SVAL(cli->inbuf, smb_vwv2);
-		bwritten += (((int)(SVAL(cli->inbuf, smb_vwv4)))<<16);
+		if (writesize > 0xFFFF) {
+			bwritten += (((int)(SVAL(cli->inbuf, smb_vwv4)))<<16);
+		}
 	}
 
 	while (received < issued && cli_receive_smb(cli)) {
diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index b3f0fc5..427fadc 100644
--- a/source/smbd/reply.c
+++ b/source/smbd/reply.c
@@ -2656,7 +2656,7 @@ void send_file_readbraw(connection_struct *conn,
 	 * reply_readbraw has already checked the length.
 	 */
 
-	if ( (chain_size == 0) && (nread > 0) &&
+	if ( (chain_size == 0) && (nread > 0) && (fsp->base_fsp == NULL) &&
 	    (fsp->wcp == NULL) && lp_use_sendfile(SNUM(conn)) ) {
 		char header[4];
 		DATA_BLOB header_blob;
@@ -3131,7 +3131,7 @@ static void send_file_readX(connection_struct *conn, struct smb_request *req,
 	 */
 
 	if ((chain_size == 0) && (CVAL(req->inbuf,smb_vwv0) == 0xFF) &&
-	    !is_encrypted_packet(req->inbuf) &&
+	    !is_encrypted_packet(req->inbuf) && (fsp->base_fsp == NULL) &&
 	    lp_use_sendfile(SNUM(conn)) && (fsp->wcp == NULL) ) {
 		uint8 headerbuf[smb_size + 12 * 2];
 		DATA_BLOB header;


-- 
Samba Shared Repository


More information about the samba-cvs mailing list