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/torture.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/torture.c')
| -rw-r--r-- | source4/torture/torture.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/torture/torture.c b/source4/torture/torture.c index 157233d43d..d7dbbc43cf 100644 --- a/source4/torture/torture.c +++ b/source4/torture/torture.c @@ -193,10 +193,10 @@ BOOL check_error(const char *location, struct smbcli_state *c, class = NT_STATUS_DOS_CLASS(status); num = NT_STATUS_DOS_CODE(status); if (eclass != class || ecode != num) { - printf("unexpected error code class=%d code=%d\n", - (int)class, (int)num); - printf(" expected %d/%d %s (at %s)\n", - (int)eclass, (int)ecode, nt_errstr(nterr), location); + printf("unexpected error code %s\n", nt_errstr(status)); + printf(" expected %s or %s (at %s)\n", + nt_errstr(NT_STATUS_DOS(eclass, ecode)), + nt_errstr(nterr), location); return False; } } else { |