svn commit: samba r8107 - in branches/SAMBA_4_0/source: ntvfs torture/raw

tridge at samba.org tridge at samba.org
Mon Jul 4 01:57:54 GMT 2005


Author: tridge
Date: 2005-07-04 01:57:53 +0000 (Mon, 04 Jul 2005)
New Revision: 8107

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

Log:
now that we properly separate DOS and NT status codes all the places
that relied on the mapping need to be fixed. The first thing is to get
all the torture tests working against w2k3 again with nt status codes
enabled. The 2nd step will be to make them pass with nt status
disabled.

This starts on the first task, fixing the assumption that
NT_STATUS_INVALID_LOCK_SEQUENCE is a valid substitute for
ERRDOS:ERRbadaccess

Modified:
   branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c
   branches/SAMBA_4_0/source/torture/raw/open.c


Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c	2005-07-04 01:45:52 UTC (rev 8106)
+++ branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c	2005-07-04 01:57:53 UTC (rev 8107)
@@ -272,7 +272,7 @@
 			SEC_RIGHTS_FILE_WRITE;
 		break;
 	default:
-		return NT_STATUS_INVALID_LOCK_SEQUENCE;
+		return NT_STATUS_DOS(ERRDOS, ERRbadaccess);
 	}
 
 	switch (open_mode & OPENX_MODE_DENY_MASK) {
@@ -311,7 +311,7 @@
 		io2->generic.in.share_access = NTCREATEX_SHARE_ACCESS_NONE;
 		break;
 	default:
-		return NT_STATUS_INVALID_LOCK_SEQUENCE;
+		return NT_STATUS_DOS(ERRDOS, ERRbadaccess);
 	}
 
 	switch (open_func) {
@@ -336,7 +336,7 @@
 			io2->generic.in.open_disposition = NTCREATEX_DISP_CREATE;
 			break;
 		}
-		return NT_STATUS_INVALID_LOCK_SEQUENCE;
+		return NT_STATUS_DOS(ERRDOS, ERRbadaccess);
 	}
 
 	return NT_STATUS_OK;

Modified: branches/SAMBA_4_0/source/torture/raw/open.c
===================================================================
--- branches/SAMBA_4_0/source/torture/raw/open.c	2005-07-04 01:45:52 UTC (rev 8106)
+++ branches/SAMBA_4_0/source/torture/raw/open.c	2005-07-04 01:57:53 UTC (rev 8107)
@@ -278,8 +278,8 @@
 		{ OPENX_OPEN_FUNC_OPEN,  	                  False, NT_STATUS_OBJECT_NAME_NOT_FOUND },
 		{ OPENX_OPEN_FUNC_OPEN  | OPENX_OPEN_FUNC_CREATE, True,  NT_STATUS_OK },
 		{ OPENX_OPEN_FUNC_OPEN  | OPENX_OPEN_FUNC_CREATE, False, NT_STATUS_OK },
-		{ OPENX_OPEN_FUNC_FAIL, 	                  True,  NT_STATUS_INVALID_LOCK_SEQUENCE },
-		{ OPENX_OPEN_FUNC_FAIL, 	                  False, NT_STATUS_INVALID_LOCK_SEQUENCE },
+		{ OPENX_OPEN_FUNC_FAIL, 	                  True,  NT_STATUS_DOS(ERRDOS, ERRbadaccess) },
+		{ OPENX_OPEN_FUNC_FAIL, 	                  False, NT_STATUS_DOS(ERRDOS, ERRbadaccess) },
 		{ OPENX_OPEN_FUNC_FAIL  | OPENX_OPEN_FUNC_CREATE, True,  NT_STATUS_OBJECT_NAME_COLLISION },
 		{ OPENX_OPEN_FUNC_FAIL  | OPENX_OPEN_FUNC_CREATE, False, NT_STATUS_OK },
 		{ OPENX_OPEN_FUNC_TRUNC, 	                  True,  NT_STATUS_OK },



More information about the samba-cvs mailing list