The branch, v3-6-test has been updated
via 6e77eac Fix bug #8664 - Renaming a symlink fails if the symlink
target is outside of the share.
from c92513e idl: add to_null property
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 6e77eac8f21925460e3b1946c2c22f6eff296322
Author: Jeremy Allison <[email protected]>
Date: Fri Dec 16 15:53:46 2011 -0800
Fix bug #8664 - Renaming a symlink fails if the symlink target is outside
of the share.
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/reply.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index b86ccd3..c0e8a98 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -6603,6 +6603,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);
@@ -6645,7 +6647,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);
@@ -6663,7 +6665,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);
--
Samba Shared Repository
