svn commit: samba r9794 - in branches/SAMBA_4_0: . source/ntvfs/ipc

[tridge at samba.org]

Author: tridge
Date: 2005-08-30 12:51:05 +0000 (Tue, 30 Aug 2005)
New Revision: 9794

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9794

Log:
 r11627 at blu:  tridge | 2005-08-30 22:55:27 +1000
 fill in correct error code for zero length and too large IPC reads
 

Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: svk:merge
   - a953eb74-4aff-0310-a63c-855d20285ebb:/local/samba4:11611
   + a953eb74-4aff-0310-a63c-855d20285ebb:/local/samba4:11627

Modified: branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c	2005-08-30 12:27:53 UTC (rev 9793)
+++ branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c	2005-08-30 12:51:05 UTC (rev 9794)
@@ -372,7 +372,7 @@
 	DATA_BLOB data;
 	uint16_t fnum;
 	struct pipe_state *p;
-	NTSTATUS status = NT_STATUS_FOOBAR;
+	NTSTATUS status = NT_STATUS_OK;
 
 	if (rd->generic.level != RAW_READ_GENERIC) {
 		return ntvfs_map_read(req, rd, ntvfs);
@@ -388,7 +388,7 @@
 	data.length = rd->readx.in.maxcnt;
 	data.data = rd->readx.out.data;
 	if (data.length > UINT16_MAX) {
-		data.length = 0;
+		data.length = UINT16_MAX;
 	}
 
 	if (data.length != 0) {