diff options
| author | Jeremy Allison <jra@samba.org> | 2022-11-10 14:43:15 -0800 |
|---|---|---|
| committer | Jule Anger <janger@samba.org> | 2023-01-23 09:27:12 +0000 |
| commit | f0729d7a72d4297a04faf8b20d2ea1a34aa70940 (patch) | |
| tree | e7bdbb9a15ebfdb52a76c4b0978b5fb3477a835d | |
| parent | cd3479c64a838417d4f3f1d8dfd8f180c819b6a3 (diff) | |
| download | samba-f0729d7a72d4297a04faf8b20d2ea1a34aa70940.tar.gz | |
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
(cherry picked from commit fa4eba131b882c3858b28f5fd9864998e19a4510)
| -rw-r--r-- | selftest/knownfail.d/smb2-ioctl-stream | 1 | ||||
| -rw-r--r-- | source3/modules/vfs_default.c | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/selftest/knownfail.d/smb2-ioctl-stream b/selftest/knownfail.d/smb2-ioctl-stream deleted file mode 100644 index 518726e8f19..00000000000 --- 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 48ff174ebbe..91f41578f25 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -1494,7 +1494,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: |