diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-07-04 05:05:28 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:19:10 -0500 |
| commit | fee56ea90040a020cfe1938a3678effa00b772d4 (patch) | |
| tree | 0ce5c2fb63ff0b65e7c21e2034f2ec5402ede7aa /source4/torture/raw/lock.c | |
| parent | 54fba5b1b875cdb549510ad1d218b39b2a3c6d64 (diff) | |
| download | samba-fee56ea90040a020cfe1938a3678effa00b772d4.tar.gz samba-fee56ea90040a020cfe1938a3678effa00b772d4.tar.bz2 samba-fee56ea90040a020cfe1938a3678effa00b772d4.zip | |
r8117: fixed a bunch more dos error code handing.
The biggest change was fixing the RAW-CONTEXT test. It was forcing
capabilities to zero in an attempt to not negotiated extended
security, but as a side effect it was forcing negotiation of dos error
codes. This confused the hell out of the test code!
Also fixed a bunch of places incorrectly using NT_STATUS_V() instead
of NT_STATUS_EQUAL() and several places that had the wrong dos status
codes
(This used to be commit 0b22744f40804a0d6dc94bfc40ec09306f584f7e)
Diffstat (limited to 'source4/torture/raw/lock.c')
| -rw-r--r-- | source4/torture/raw/lock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/torture/raw/lock.c b/source4/torture/raw/lock.c index 88bf6ccaff..b2874351ec 100644 --- a/source4/torture/raw/lock.c +++ b/source4/torture/raw/lock.c @@ -496,14 +496,14 @@ static BOOL test_async(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) io.lockx.in.timeout = 0; io.lockx.in.mode = LOCKING_ANDX_CANCEL_LOCK; status = smb_raw_lock(cli->tree, &io); - CHECK_STATUS(status, NT_STATUS_UNSUCCESSFUL); + CHECK_STATUS(status, NT_STATUS_DOS(ERRDOS, ERRcancelviolation)); /* cancel with the wrong bits set */ lock[0].offset = 100; io.lockx.in.timeout = 0; io.lockx.in.mode = LOCKING_ANDX_CANCEL_LOCK; status = smb_raw_lock(cli->tree, &io); - CHECK_STATUS(status, NT_STATUS_UNSUCCESSFUL); + CHECK_STATUS(status, NT_STATUS_DOS(ERRDOS, ERRcancelviolation)); /* cancel the right range */ lock[0].offset = 100; @@ -640,7 +640,7 @@ static BOOL test_changetype(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) /* windows server don't seem to support this */ io.lockx.in.mode = LOCKING_ANDX_CHANGE_LOCKTYPE; status = smb_raw_lock(cli->tree, &io); - CHECK_STATUS(status, NT_STATUS_UNSUCCESSFUL); + CHECK_STATUS(status, NT_STATUS_DOS(ERRDOS, ERRnoatomiclocks)); if (smbcli_write(cli->tree, fnum, 0, &c, 100, 1) == 1) { printf("allowed write after lock change (%s)\n", __location__); |