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 <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Fri Nov  6 03:21:01 CET 2015 on sn-devel-104

diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index 4d649830446890ccc8b77bcc695216633713f1d5..2939689e816acc85142d219db6a2c926dd8ccc64 100644 (file)
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -91,7 +91,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;
        }