[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  ae1c040... s4:smb_server/smb: SMBreadX can return STATUS_BUFFER_OVERFLOW
      from  21ec116... libcli/named_pipe_auth: we need to hide length of the message mode header from the caller

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


- Log -----------------------------------------------------------------
commit ae1c040b518273fd83797fcde170141aec9fe182
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Apr 28 12:27:09 2010 +0200

    s4:smb_server/smb: SMBreadX can return STATUS_BUFFER_OVERFLOW
    
    metze

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

Summary of changes:
 source4/smb_server/smb/reply.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/smb_server/smb/reply.c b/source4/smb_server/smb/reply.c
index 7d33a37..ff27094 100644
--- a/source4/smb_server/smb/reply.c
+++ b/source4/smb_server/smb/reply.c
@@ -811,7 +811,7 @@ static void reply_read_and_X_send(struct ntvfs_request *ntvfs)
 	struct smbsrv_request *req;
 	union smb_read *io;
 
-	SMBSRV_CHECK_ASYNC_STATUS(io, union smb_read);
+	SMBSRV_CHECK_ASYNC_STATUS_ERR(io, union smb_read);
 
 	/* readx reply packets can be over-sized */
 	req->control_flags |= SMBSRV_REQ_CONTROL_LARGE;
@@ -834,6 +834,10 @@ static void reply_read_and_X_send(struct ntvfs_request *ntvfs)
 	SSVAL(req->out.vwv, VWV(7), (io->readx.out.nread>>16));
 	SMBSRV_VWV_RESERVED(8, 4);
 
+	if (!NT_STATUS_IS_OK(req->ntvfs->async_states->status)) {
+		smbsrv_setup_error(req, req->ntvfs->async_states->status);
+	}
+
 	smbsrv_chain_reply(req);
 }
 


-- 
Samba Shared Repository