Attachment 7201 Details for Bug 8664 – git-am fix for 3.6.next

[patch] git-am fix for 3.6.next

0001-Fix-bug-8664-Renaming-a-symlink-fails-if-the-symlink.patch (text/plain), 1.40 KB, created by Jeremy Allison on 2011-12-17 00:02:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2011-12-17 00:02:55 UTC

Size: 1.40 KB

patch

obsolete

>From d3f1598fac1ef2e3f5b1cb82f519916bbf84f94a Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Fri, 16 Dec 2011 15:53:46 -0800
>Subject: [PATCH] Fix bug #8664 - Renaming a symlink fails if the symlink target is outside of the share.
>
>---
> source3/smbd/reply.c |    6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
>index ac450bb..6d3ea1d 100644
>--- a/source3/smbd/reply.c
>+++ b/source3/smbd/reply.c
>@@ -6608,6 +6608,8 @@ void reply_mv(struct smb_request *req)
> 	TALLOC_CTX *ctx = talloc_tos();
> 	struct smb_filename *smb_fname_src = NULL;
> 	struct smb_filename *smb_fname_dst = NULL;
>+	uint32_t src_ucf_flags = lp_posix_pathnames() ? UCF_UNIX_NAME_LOOKUP : UCF_COND_ALLOW_WCARD_LCOMP;
>+	uint32_t dst_ucf_flags = UCF_SAVE_LCOMP | (lp_posix_pathnames() ? 0 : UCF_COND_ALLOW_WCARD_LCOMP);
> 	bool stream_rename = false;
> 
> 	START_PROFILE(SMBmv);
>@@ -6650,7 +6652,7 @@ void reply_mv(struct smb_request *req)
> 				  conn,
> 				  req->flags2 & FLAGS2_DFS_PATHNAMES,
> 				  name,
>-				  UCF_COND_ALLOW_WCARD_LCOMP,
>+				  src_ucf_flags,
> 				  &src_has_wcard,
> 				  &smb_fname_src);
> 
>@@ -6668,7 +6670,7 @@ void reply_mv(struct smb_request *req)
> 				  conn,
> 				  req->flags2 & FLAGS2_DFS_PATHNAMES,
> 				  newname,
>-				  UCF_COND_ALLOW_WCARD_LCOMP | UCF_SAVE_LCOMP,
>+				  dst_ucf_flags,
> 				  &dest_has_wcard,
> 				  &smb_fname_dst);
> 
>-- 
>1.7.3.1
>

Flags:

vl: review+

Actions: View

Attachments on bug 8664: 7198 | 7201