Attachment 11585 Details for Bug 11243 – Patch for 4.2 and 4.3 cherry-picked from master

[patch] Patch for 4.2 and 4.3 cherry-picked from master

patch (text/plain), 1.32 KB, created by Ralph Böhme on 2015-11-06 11:20:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralph Böhme

Created: 2015-11-06 11:20:25 UTC

Size: 1.32 KB

patch

obsolete

>From 23663b9719877e1c87af258aba1ab1c69eb5768b Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>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 <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
>---
> 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
>

Flags:

vl: review+

Actions: View

Attachments on bug 11243: 11002 | 11003 | 11004 | 11579 | 11585