Attachment 3297 Details for Bug 5477 – Patch

[patch] Patch

look (text/plain), 1.68 KB, created by Jeremy Allison on 2008-05-20 14:14:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2008-05-20 14:14:29 UTC

Size: 1.68 KB

patch

obsolete

>diff --git a/source/lib/recvfile.c b/source/lib/recvfile.c
>index f9788fd..07c1f68 100644
>--- a/source/lib/recvfile.c
>+++ b/source/lib/recvfile.c
>@@ -58,6 +58,11 @@ static ssize_t default_sys_recvfile(int fromfd,
> 	size_t total_written = 0;
> 	char *buffer = NULL;
> 
>+	DEBUG(10,("default_sys_recvfile: from = %d, to = %d, "
>+		"offset=%.0f, count = %lu\n",
>+		fromfd, tofd, (double)offset,
>+		(unsigned long)count));
>+
> 	if (count == 0) {
> 		return 0;
> 	}
>@@ -141,6 +146,11 @@ ssize_t sys_recvfile(int fromfd,
> {
> 	size_t total_written = 0;
> 
>+	DEBUG(10,("sys_recvfile: from = %d, to = %d, "
>+		"offset=%.0f, count = %lu\n",
>+		fromfd, tofd, (double)offset,
>+		(unsigned long)count));
>+
> 	if (count == 0) {
> 		return 0;
> 	}
>diff --git a/source/smbd/process.c b/source/smbd/process.c
>index 5946989..2fc88ca 100644
>--- a/source/smbd/process.c
>+++ b/source/smbd/process.c
>@@ -252,6 +252,8 @@ static NTSTATUS receive_smb_raw_talloc_partial_read(TALLOC_CTX *mem_ctx,
> 			timeout, toread);
> 
> 		if (!NT_STATUS_IS_OK(status)) {
>+			DEBUG(10, ("receive_smb_raw_talloc_partial_read: %s\n",
>+				   nt_errstr(status)));
> 			return status;
> 		}
> 	}
>@@ -282,14 +284,8 @@ static NTSTATUS receive_smb_raw_talloc(TALLOC_CTX *mem_ctx, int fd,
> 			smb_len_large(lenbuf) > min_recv_size && /* Could be a UNIX large writeX. */
> 			!srv_is_signing_active()) {
> 
>-		status = receive_smb_raw_talloc_partial_read(
>-			mem_ctx, lenbuf, fd, buffer, timeout, p_unread, &len);
>-
>-		if (!NT_STATUS_IS_OK(status)) {
>-			DEBUG(10, ("receive_smb_raw: %s\n",
>-				   nt_errstr(status)));
>-			return status;
>-		}
>+		return receive_smb_raw_talloc_partial_read(
>+			mem_ctx, lenbuf, fd, buffer, timeout, p_unread, plen);
> 	}
> 
> 	if (!valid_packet_size(len)) {

Actions: View

Attachments on bug 5477: 3297