diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-07-04 01:57:53 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:19:08 -0500 |
| commit | 74942e1a11501dd75085b29f16ac66cd2185fe2b (patch) | |
| tree | 1a8ecc6a96cd691f2b4bc26a30b65fa4f8d108c4 | |
| parent | b3383236a27655227fd20b10252e156aac8e61c5 (diff) | |
| download | samba-74942e1a11501dd75085b29f16ac66cd2185fe2b.tar.gz samba-74942e1a11501dd75085b29f16ac66cd2185fe2b.tar.bz2 samba-74942e1a11501dd75085b29f16ac66cd2185fe2b.zip | |
r8107: 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
(This used to be commit 87cdd117081193d215c5a9e3603438e058ad777b)
| -rw-r--r-- | source4/ntvfs/ntvfs_generic.c | 6 | ||||
| -rw-r--r-- | source4/torture/raw/open.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source4/ntvfs/ntvfs_generic.c b/source4/ntvfs/ntvfs_generic.c index 9b6c75e5c6..024a48bf7a 100644 --- a/source4/ntvfs/ntvfs_generic.c +++ b/source4/ntvfs/ntvfs_generic.c @@ -272,7 +272,7 @@ static NTSTATUS map_openx_open(uint16_t flags, uint16_t open_mode, 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 @@ static NTSTATUS map_openx_open(uint16_t flags, uint16_t open_mode, 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 @@ static NTSTATUS map_openx_open(uint16_t flags, uint16_t open_mode, 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; diff --git a/source4/torture/raw/open.c b/source4/torture/raw/open.c index 8792ab7cab..afd6963b41 100644 --- a/source4/torture/raw/open.c +++ b/source4/torture/raw/open.c @@ -278,8 +278,8 @@ static BOOL test_openx(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) { 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 }, |