[SCM] Samba Shared Repository - branch v3-5-test updated

Karolin Seeger kseeger at samba.org
Wed Jan 18 13:37:42 MST 2012


The branch, v3-5-test has been updated
       via  33fd999 Fix bug #8664 - Renaming a symlink fails if the symlink target is outside of the share.
      from  aa217fb s3-libads: fix malloc/talloc mismatch in ads_keytab_verify_ticket().

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit 33fd99946178e3c2649b289580b1ae1285c46d23
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Dec 16 12:13:52 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 12d20ff..9138aa6 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -6278,6 +6278,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);
 
 	START_PROFILE(SMBmv);
 
@@ -6307,7 +6309,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);
 
@@ -6325,7 +6327,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


More information about the samba-cvs mailing list