summaryrefslogtreecommitdiff
path: root/source4/torture/basic/delete.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/delete.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/delete.c')
-rw-r--r--source4/torture/basic/delete.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/torture/basic/delete.c b/source4/torture/basic/delete.c
index f3aef08ce1..7ddd39c1cb 100644
--- a/source4/torture/basic/delete.c
+++ b/source4/torture/basic/delete.c
@@ -550,7 +550,7 @@ BOOL torture_test_delete(void)
status = smbcli_nt_delete_on_close(cli1->tree, fnum1, True);
- if (NT_STATUS_V(status) != NT_STATUS_V(NT_STATUS_CANNOT_DELETE)) {
+ if (!NT_STATUS_EQUAL(status, NT_STATUS_CANNOT_DELETE)) {
printf("(%s) setting delete_on_close should fail with NT_STATUS_CANNOT_DELETE. Got %s instead)\n",
__location__, smbcli_errstr(cli1->tree));
correct = False;
@@ -585,7 +585,7 @@ BOOL torture_test_delete(void)
goto fail;
} else {
status = smbcli_nt_error(cli1->tree);
- if (NT_STATUS_V(status) != NT_STATUS_V(NT_STATUS_CANNOT_DELETE)) {
+ if (!NT_STATUS_EQUAL(status, NT_STATUS_CANNOT_DELETE)) {
printf("(%s) setting delete_on_close on open should fail with NT_STATUS_CANNOT_DELETE. Got %s instead)\n",
__location__, smbcli_errstr(cli1->tree));
correct = False;