[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  314a926... Fix up debug info on smb2_rename code.
      from  3551eb7... Implement rename/move in SMB2 from Windows7.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 314a926179b02d7139016e56abc63a037e60ba43
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Feb 25 11:57:54 2010 -0800

    Fix up debug info on smb2_rename code.
    
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/trans2.c |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index eff5fba..d24efc4 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -5927,16 +5927,9 @@ static NTSTATUS smb2_file_rename_information(connection_struct *conn,
 		return status;
 	}
 
-	DEBUG(10,("smb_file_rename_information: got name |%s|\n",
+	DEBUG(10,("smb2_file_rename_information: got name |%s|\n",
 				newname));
 
-#if 0
-	/* Check the new name has no '/' characters. */
-	if (strchr_m(newname, '/')) {
-		return NT_STATUS_NOT_SUPPORTED;
-	}
-#endif
-
 	status = filename_convert(ctx,
 				conn,
 				req->flags2 & FLAGS2_DFS_PATHNAMES,
@@ -5975,7 +5968,7 @@ static NTSTATUS smb2_file_rename_information(connection_struct *conn,
 
 	}
 
-	DEBUG(10,("smb_file_rename_information: "
+	DEBUG(10,("smb2_file_rename_information: "
 		  "SMB_FILE_RENAME_INFORMATION (fnum %d) %s -> %s\n",
 		  fsp->fnum, fsp_str_dbg(fsp),
 		  smb_fname_str_dbg(smb_fname_dst)));
@@ -7584,6 +7577,7 @@ NTSTATUS smbd_do_setfilepathinfo(connection_struct *conn,
 							     fsp, smb_fname);
 			break;
 		}
+
 #if defined(HAVE_POSIX_ACLS)
 		case SMB_SET_POSIX_ACL:
 		{


-- 
Samba Shared Repository