summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-07-04 05:16:57 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:19:11 -0500
commit8ade96e5e4385767dfd733db966f85ef16d77501 (patch)
tree7695bd7779a01735de076b58f6cd0710e592e0a9
parentafe376bfc71f7dc157791643497792afee33f05d (diff)
downloadsamba-8ade96e5e4385767dfd733db966f85ef16d77501.tar.gz
samba-8ade96e5e4385767dfd733db966f85ef16d77501.tar.bz2
samba-8ade96e5e4385767dfd733db966f85ef16d77501.zip
r8121: yuck. w2k3 seems to choose ERRDOS:ERRbaduid or
NT_STATUS_INVALID_HANDLE on a per call basis for a bad vuid. That means it is doing checking for a valid vuid in each backend function, rather than globally. I don't want to emulate that as it is way too error prone, and could easily lead to a security hole, so instead accept either error code in our test suite. (This used to be commit aefa9e53fa97551c1b15bdd50565881e63aea9a8)
-rw-r--r--source4/torture/torture.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index d7dbbc43cf..935d1211e1 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -1347,7 +1347,9 @@ static BOOL run_vuidtest(void)
}
if (!NT_STATUS_EQUAL(cli->transport->error.e.nt_status,
- NT_STATUS_DOS(ERRSRV, ERRbaduid))) {
+ NT_STATUS_DOS(ERRSRV, ERRbaduid)) &&
+ !NT_STATUS_EQUAL(cli->transport->error.e.nt_status,
+ NT_STATUS_INVALID_HANDLE)) {
printf("ERROR: qfileinfo should have returned DOS error "
"ERRSRV:ERRbaduid\n but returned %s\n",
smbcli_errstr(cli->tree));