summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorRalph Boehme <slow@samba.org>2019-09-26 10:31:51 -0700
committerRalph Boehme <slow@samba.org>2019-10-02 08:01:40 +0000
commit993d327f5d24305d96781afeb11855487323975d (patch)
tree650f19524f76c58553cff59c8b30219336e6b6e6 /source3/smbd
parent4b2e44a6ed7de9b1a25c3bf08de24dd49c7f6c1d (diff)
downloadsamba-993d327f5d24305d96781afeb11855487323975d.tar.gz
s3:smbd: use is_named_stream() in a a few places
This simplifies (and corrects) things in the VFS as there the caller is only interested in whether a name is pointing to a real named stream most of the times. Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/dosmode.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index 32a01c271c6..38d34623336 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -736,14 +736,9 @@ static uint32_t dos_mode_post(uint32_t dosmode,
* BUG: https://bugzilla.samba.org/show_bug.cgi?id=13380
*/
- if (is_ntfs_stream_smb_fname(smb_fname)) {
+ if (is_named_stream(smb_fname)) {
/* is_ntfs_stream_smb_fname() returns false for a POSIX path. */
- if (!is_ntfs_default_stream_smb_fname(smb_fname)) {
- /*
- * Non-default stream name, not a posix path.
- */
- dosmode &= ~(FILE_ATTRIBUTE_DIRECTORY);
- }
+ dosmode &= ~(FILE_ATTRIBUTE_DIRECTORY);
}
if (conn->fs_capabilities & FILE_FILE_COMPRESSION) {