s3: smbd: Always use metadata_fsp() when processing fsctls.

Currently all fsctls we implement need the base fsp, not
an alternate data stream fsp. We may revisit this later
if we implement fsctls that operate on an ADS.

Remove knownfail.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15236

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andrew Walker <awalker@ixsystems.com>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Mon Nov 14 18:13:31 UTC 2022 on sn-devel-184

diff --git a/selftest/knownfail.d/smb2-ioctl-stream b/selftest/knownfail.d/smb2-ioctl-stream
deleted file mode 100644 (file)
index 518726e..0000000
--- a/selftest/knownfail.d/smb2-ioctl-stream
+++ /dev/null
@@ -1 +0,0 @@
-^samba3.smb2.ioctl-on-stream.ioctl-on-stream\(fileserver\)

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 93a56ef8019fc1c7fe2a9f5febcaa4b767cba4be..000c23208f560ee38fbccf7fa61a65a3a2ebf62d 100644 (file)
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -1487,7 +1487,13 @@ static NTSTATUS vfswrap_fsctl(struct vfs_handle_struct *handle,
        char **out_data = (char **)_out_data;
        NTSTATUS status;
 
-       SMB_ASSERT(!fsp_is_alternate_stream(fsp));
+       /*
+        * Currently all fsctls operate on the base
+        * file if given an alternate data stream.
+        * Revisit this if we implement fsctls later
+        * that need access to the ADS handle.
+        */
+       fsp = metadata_fsp(fsp);
 
        switch (function) {
        case FSCTL_SET_SPARSE: