From 23663b9719877e1c87af258aba1ab1c69eb5768b Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 5 Nov 2015 13:22:33 +0100 Subject: [PATCH] vfs_gpfs: Re-enable share modes is_ntfs_default_stream_smb_fname returns false for a NULL stream name, so for streamless filenames we do not set gpfs share modes without this patch. Bug: https://bugzilla.samba.org/show_bug.cgi?id=11243 Signed-off-by: Volker Lendecke Reviewed-by: Stefan Metzmacher Autobuild-User(master): Volker Lendecke Autobuild-Date(master): Fri Nov 6 03:21:01 CET 2015 on sn-devel-104 --- source3/modules/vfs_gpfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c index 22b1b30..dc53da0 100644 --- a/source3/modules/vfs_gpfs.c +++ b/source3/modules/vfs_gpfs.c @@ -141,7 +141,8 @@ static int vfs_gpfs_kernel_flock(vfs_handle_struct *handle, files_struct *fsp, * fd, so lacking a distinct fd for the stream we have to skip * kernel_flock and set_gpfs_sharemode for stream. */ - if (!is_ntfs_default_stream_smb_fname(fsp->fsp_name)) { + if (is_ntfs_stream_smb_fname(fsp->fsp_name) && + !is_ntfs_default_stream_smb_fname(fsp->fsp_name)) { DEBUG(2,("%s: kernel_flock on stream\n", fsp_str_dbg(fsp))); return 0; } -- 2.1.0