summaryrefslogtreecommitdiff
path: root/source4/torture/basic/attr.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-07-04 05:05:28 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:19:10 -0500
commitfee56ea90040a020cfe1938a3678effa00b772d4 (patch)
tree0ce5c2fb63ff0b65e7c21e2034f2ec5402ede7aa /source4/torture/basic/attr.c
parent54fba5b1b875cdb549510ad1d218b39b2a3c6d64 (diff)
downloadsamba-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/attr.c')
-rw-r--r--source4/torture/basic/attr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/torture/basic/attr.c b/source4/torture/basic/attr.c
index 07a36ea950..daa0f98d60 100644
--- a/source4/torture/basic/attr.c
+++ b/source4/torture/basic/attr.c
@@ -130,15 +130,15 @@ BOOL torture_openattrtest(void)
if (fnum1 == -1) {
for (l = 0; l < ARRAY_SIZE(attr_results); l++) {
if (attr_results[l].num == k) {
- printf("[%d] trunc open 0x%x -> 0x%x of %s failed - should have succeeded !(0x%x:%s)\n",
+ printf("[%d] trunc open 0x%x -> 0x%x of %s failed - should have succeeded !(%s)\n",
k, open_attrs_table[i],
open_attrs_table[j],
- fname, NT_STATUS_V(smbcli_nt_error(cli1->tree)), smbcli_errstr(cli1->tree));
+ fname, smbcli_errstr(cli1->tree));
correct = False;
CHECK_MAX_FAILURES(error_exit);
}
}
- if (NT_STATUS_V(smbcli_nt_error(cli1->tree)) != NT_STATUS_V(NT_STATUS_ACCESS_DENIED)) {
+ if (!NT_STATUS_EQUAL(smbcli_nt_error(cli1->tree), NT_STATUS_ACCESS_DENIED)) {
printf("[%d] trunc open 0x%x -> 0x%x failed with wrong error code %s\n",
k, open_attrs_table[i], open_attrs_table[j],
smbcli_errstr(cli1->tree));