summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-10-25 07:11:12 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:04:40 -0500
commit611e9e601c4bcfa7e871bfd6b53bc8b5bb1c6ad4 (patch)
tree7202acbb163520ab5f00ed62d7294fcff0d0ef5a
parent5d1c5d38539c081f91fd5a456517f5913e593692 (diff)
downloadsamba-611e9e601c4bcfa7e871bfd6b53bc8b5bb1c6ad4.tar.gz
samba-611e9e601c4bcfa7e871bfd6b53bc8b5bb1c6ad4.tar.bz2
samba-611e9e601c4bcfa7e871bfd6b53bc8b5bb1c6ad4.zip
r3202: return a old DOS error code ERRSRV:ERRbaduid for a bad vuid. This means we now pass the BASE-VUID test.
(This used to be commit 560300c0025940d84c9be41447145f4b441e7105)
-rwxr-xr-xsource4/script/tests/test_posix.sh4
-rw-r--r--source4/smb_server/smb_server.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/script/tests/test_posix.sh b/source4/script/tests/test_posix.sh
index 5788e50e36..1953f43e76 100755
--- a/source4/script/tests/test_posix.sh
+++ b/source4/script/tests/test_posix.sh
@@ -30,7 +30,7 @@ testit() {
tests="BASE-FDPASS BASE-LOCK1 BASE-LOCK2 BASE-LOCK3 BASE-LOCK4"
tests="$tests BASE-LOCK5 BASE-LOCK6 BASE-LOCK7 BASE-UNLINK BASE-ATTR"
-tests="$tests BASE-NEGNOWAIT BASE-DIR"
+tests="$tests BASE-NEGNOWAIT BASE-DIR BASE-VUID"
tests="$tests BASE-DENY2 BASE-TCON BASE-TCONDEV BASE-RW1"
tests="$tests BASE-DENY3 BASE-XCOPY BASE-OPEN"
tests="$tests BASE-DELETE BASE-PROPERTIES BASE-MANGLE"
@@ -39,7 +39,7 @@ tests="$tests RAW-QFSINFO RAW-QFILEINFO RAW-SFILEINFO-BUG"
tests="$tests RAW-LOCK RAW-MKDIR RAW-SEEK RAW-CONTEXT BASE-RENAME"
-soon="BASE-DIR1 BASE-DENY1 BASE-VUID BASE-DEFER_OPEN BASE-OPENATTR BASE-CHARSET"
+soon="BASE-DIR1 BASE-DENY1 BASE-DEFER_OPEN BASE-OPENATTR BASE-CHARSET"
soon="$soon RAW-SFILEINFO RAW-SEARCH RAW-OPEN RAW-OPLOCK RAW-NOTIFY RAW-MUX RAW-IOCTL"
soon="$soon RAW-CHKPATH RAW-UNLINK RAW-READ RAW-WRITE RAW-RENAME RAW-CLOSE BASE-TRANS2"
diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c
index 97df603517..920f56d334 100644
--- a/source4/smb_server/smb_server.c
+++ b/source4/smb_server/smb_server.c
@@ -480,7 +480,7 @@ static void switch_message(int type, struct smbsrv_request *req)
/* see if the vuid is valid */
if ((flags & AS_USER) && !req->session) {
if (!(flags & AS_GUEST)) {
- req_reply_error(req, NT_STATUS_INVALID_HANDLE);
+ req_reply_error(req, NT_STATUS_DOS(ERRSRV, ERRbaduid));
return;
}
}