For non-existent streams we have to return OBJECT_NAME_NOT_FOUND

See the STREAMERROR s3 torture test.

Jeremy, Tim, please check!

diff --git a/source3/script/tests/test_smbtorture_s3.sh b/source3/script/tests/test_smbtorture_s3.sh
index 4e439fe8a04522c12084119c059213470291b01a..c577ed18d4244756cd57ec029e33e44c99385de4 100755 (executable)
--- a/source3/script/tests/test_smbtorture_s3.sh
+++ b/source3/script/tests/test_smbtorture_s3.sh
@@ -24,7 +24,7 @@ incdir=`dirname $0`
 tests="FDPASS LOCK1 LOCK2 LOCK3 LOCK4 LOCK5 LOCK6 LOCK7"
 #tests="$tests UNLINK BROWSE ATTR TRANS2 MAXFID TORTURE "
 tests="$tests UNLINK BROWSE ATTR TRANS2 TORTURE "
-tests="$tests OPLOCK1 OPLOCK2 OPLOCK3"
+tests="$tests OPLOCK1 OPLOCK2 OPLOCK3 STREAMERROR"
 tests="$tests DIR DIR1 TCON TCONDEV RW1 RW2 RW3"
 tests="$tests OPEN XCOPY RENAME DELETE PROPERTIES W2K"
 tests="$tests TCON2 IOCTL CHKPATH FDSESS LOCAL-SUBSTITUTE CHAIN1"

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 21e58041232e70379069c82ca410a163d45f5d5a..df31365675d7e64af35684cf96b3c9755fcf915b 100644 (file)
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -3487,7 +3487,7 @@ NTSTATUS create_file_default(connection_struct *conn,
                TALLOC_FREE(fname);
 
                if (!(conn->fs_capabilities & FILE_NAMED_STREAMS)) {
-                       status = NT_STATUS_OBJECT_PATH_NOT_FOUND;
+                       status = NT_STATUS_OBJECT_NAME_NOT_FOUND;
                        goto fail;
                }
        }