svn commit: samba r16738 - in branches/SAMBA_4_0/source: smb_server/smb2 torture/smb2

[metze at samba.org]

Author: metze
Date: 2006-07-01 14:27:49 +0000 (Sat, 01 Jul 2006)
New Revision: 16738

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

Log:
vista beta2 use FILE_CLOSED as error for an invalid file handle

metze
Modified:
   branches/SAMBA_4_0/source/smb_server/smb2/smb2_server.h
   branches/SAMBA_4_0/source/torture/smb2/connect.c
   branches/SAMBA_4_0/source/torture/smb2/lock.c


Changeset:
Modified: branches/SAMBA_4_0/source/smb_server/smb2/smb2_server.h
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb2/smb2_server.h	2006-07-01 14:21:21 UTC (rev 16737)
+++ branches/SAMBA_4_0/source/smb_server/smb2/smb2_server.h	2006-07-01 14:27:49 UTC (rev 16738)
@@ -116,7 +116,7 @@
 
 #define SMB2SRV_CHECK_FILE_HANDLE(handle) do { \
 	if (!handle) { \
-		smb2srv_send_error(req, NT_STATUS_NOT_FOUND); \
+		smb2srv_send_error(req, NT_STATUS_FILE_CLOSED); \
 		return; \
 	} \
 } while (0)

Modified: branches/SAMBA_4_0/source/torture/smb2/connect.c
===================================================================
--- branches/SAMBA_4_0/source/torture/smb2/connect.c	2006-07-01 14:21:21 UTC (rev 16737)
+++ branches/SAMBA_4_0/source/torture/smb2/connect.c	2006-07-01 14:27:49 UTC (rev 16738)
@@ -220,7 +220,7 @@
 	}
 
 	status = smb2_util_close(tree, h1);
-	if (!NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
+	if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) {
 		printf("close should have closed the handle - %s\n", nt_errstr(status));
 		return False;
 	}

Modified: branches/SAMBA_4_0/source/torture/smb2/lock.c
===================================================================
--- branches/SAMBA_4_0/source/torture/smb2/lock.c	2006-07-01 14:21:21 UTC (rev 16737)
+++ branches/SAMBA_4_0/source/torture/smb2/lock.c	2006-07-01 14:27:49 UTC (rev 16738)
@@ -82,7 +82,7 @@
 
 	lck.in.file.handle.data[0] +=1;
 	status = smb2_lock(tree, &lck);
-	CHECK_STATUS(status, NT_STATUS_NOT_FOUND);
+	CHECK_STATUS(status, NT_STATUS_FILE_CLOSED);
 	lck.in.file.handle.data[0] -=1;
 
 	lck.in.unknown1		= 0x0001;