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/basic/locking.c | |
| parent | 54fba5b1b875cdb549510ad1d218b39b2a3c6d64 (diff) | |
| download | samba-fee56ea90040a020cfe1938a3678effa00b772d4.tar.gz samba-fee56ea90040a020cfe1938a3678effa00b772d4.tar.xz 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/basic/locking.c')
| -rw-r--r-- | source4/torture/basic/locking.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/torture/basic/locking.c b/source4/torture/basic/locking.c index c3feaae2eb2..3f395f39071 100644 --- a/source4/torture/basic/locking.c +++ b/source4/torture/basic/locking.c @@ -281,7 +281,7 @@ BOOL torture_locktest2(void) correct = False; } else { if (!check_error(__location__, cli, - ERRDOS, ERRlock, + ERRDOS, ERRnotlocked, NT_STATUS_RANGE_NOT_LOCKED)) return False; } @@ -290,7 +290,7 @@ BOOL torture_locktest2(void) correct = False; } else { if (!check_error(__location__, cli, - ERRDOS, ERRlock, + ERRDOS, ERRnotlocked, NT_STATUS_RANGE_NOT_LOCKED)) return False; } @@ -851,7 +851,7 @@ BOOL torture_locktest7(void) if (smbcli_write(cli1->tree, fnum1, 0, buf, 130, 4) != 4) { printf("pid1 unable to write to the range 130:4, error was %s\n", smbcli_errstr(cli1->tree)); - if (NT_STATUS_V(smbcli_nt_error(cli1->tree)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) { + if (!NT_STATUS_EQUAL(smbcli_nt_error(cli1->tree), NT_STATUS_FILE_LOCK_CONFLICT)) { printf("Incorrect error (should be NT_STATUS_FILE_LOCK_CONFLICT) (%s)\n", __location__); goto fail; @@ -872,7 +872,7 @@ BOOL torture_locktest7(void) if (smbcli_write(cli1->tree, fnum1, 0, buf, 130, 4) != 4) { printf("pid2 unable to write to the range 130:4, error was %s\n", smbcli_errstr(cli1->tree)); - if (NT_STATUS_V(smbcli_nt_error(cli1->tree)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) { + if (!NT_STATUS_EQUAL(smbcli_nt_error(cli1->tree), NT_STATUS_FILE_LOCK_CONFLICT)) { printf("Incorrect error (should be NT_STATUS_FILE_LOCK_CONFLICT) (%s)\n", __location__); goto fail; @@ -915,7 +915,7 @@ BOOL torture_locktest7(void) if (smbcli_read(cli1->tree, fnum1, buf, 130, 4) != 4) { printf("pid2 unable to read the range 130:4, error was %s\n", smbcli_errstr(cli1->tree)); - if (NT_STATUS_V(smbcli_nt_error(cli1->tree)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) { + if (!NT_STATUS_EQUAL(smbcli_nt_error(cli1->tree), NT_STATUS_FILE_LOCK_CONFLICT)) { printf("Incorrect error (should be NT_STATUS_FILE_LOCK_CONFLICT) (%s)\n", __location__); goto fail; @@ -929,7 +929,7 @@ BOOL torture_locktest7(void) if (smbcli_write(cli1->tree, fnum1, 0, buf, 130, 4) != 4) { printf("pid2 unable to write to the range 130:4, error was %s\n", smbcli_errstr(cli1->tree)); - if (NT_STATUS_V(smbcli_nt_error(cli1->tree)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) { + if (!NT_STATUS_EQUAL(smbcli_nt_error(cli1->tree), NT_STATUS_FILE_LOCK_CONFLICT)) { printf("Incorrect error (should be NT_STATUS_FILE_LOCK_CONFLICT) (%s)\n", __location__); goto fail; |