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/scanner.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/basic/scanner.c')
| -rw-r--r-- | source4/torture/basic/scanner.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source4/torture/basic/scanner.c b/source4/torture/basic/scanner.c index df9234feca..06dff7e72c 100644 --- a/source4/torture/basic/scanner.c +++ b/source4/torture/basic/scanner.c @@ -33,11 +33,11 @@ look for a partial hit ****************************************************************************/ static void trans2_check_hit(const char *format, int op, int level, NTSTATUS status) { - if (NT_STATUS_V(status) == NT_STATUS_V(NT_STATUS_INVALID_LEVEL) || - NT_STATUS_V(status) == NT_STATUS_V(NT_STATUS_NOT_IMPLEMENTED) || - NT_STATUS_V(status) == NT_STATUS_V(NT_STATUS_NOT_SUPPORTED) || - NT_STATUS_V(status) == NT_STATUS_V(NT_STATUS_UNSUCCESSFUL) || - NT_STATUS_V(status) == NT_STATUS_V(NT_STATUS_INVALID_INFO_CLASS)) { + if (NT_STATUS_EQUAL(status, NT_STATUS_INVALID_LEVEL) || + NT_STATUS_EQUAL(status, NT_STATUS_NOT_IMPLEMENTED) || + NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED) || + NT_STATUS_EQUAL(status, NT_STATUS_UNSUCCESSFUL) || + NT_STATUS_EQUAL(status, NT_STATUS_INVALID_INFO_CLASS)) { return; } #if VERBOSE @@ -311,11 +311,11 @@ look for a partial hit ****************************************************************************/ static void nttrans_check_hit(const char *format, int op, int level, NTSTATUS status) { - if (NT_STATUS_V(status) == NT_STATUS_V(NT_STATUS_INVALID_LEVEL) || - NT_STATUS_V(status) == NT_STATUS_V(NT_STATUS_NOT_IMPLEMENTED) || - NT_STATUS_V(status) == NT_STATUS_V(NT_STATUS_NOT_SUPPORTED) || - NT_STATUS_V(status) == NT_STATUS_V(NT_STATUS_UNSUCCESSFUL) || - NT_STATUS_V(status) == NT_STATUS_V(NT_STATUS_INVALID_INFO_CLASS)) { + if (NT_STATUS_EQUAL(status, NT_STATUS_INVALID_LEVEL) || + NT_STATUS_EQUAL(status, NT_STATUS_NOT_IMPLEMENTED) || + NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED) || + NT_STATUS_EQUAL(status, NT_STATUS_UNSUCCESSFUL) || + NT_STATUS_EQUAL(status, NT_STATUS_INVALID_INFO_CLASS)) { return; } #if VERBOSE |