[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3216-gc8b021e

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  c8b021ee740e67973b1d37eceadf7bab6c413cdd (commit)
      from  144cccebe51d726507a299880ea9a21540f44e44 (commit)

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


- Log -----------------------------------------------------------------
commit c8b021ee740e67973b1d37eceadf7bab6c413cdd
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Dec 1 14:23:16 2008 -0800

    s3:smbd: give the correct error when trying to replace a stream
    
    metze

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

Summary of changes:
 source/smbd/reply.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index 1b70f08..e445f81 100644
--- a/source/smbd/reply.c
+++ b/source/smbd/reply.c
@@ -5555,6 +5555,12 @@ NTSTATUS rename_internals_fsp(connection_struct *conn,
 		return NT_STATUS_OBJECT_NAME_COLLISION;
 	}
 
+	if(replace_if_exists && dst_exists) {
+		if (is_ntfs_stream_name(newname)) {
+			return NT_STATUS_INVALID_PARAMETER;
+		}
+	}
+
 	if (dst_exists) {
 		struct file_id fileid = vfs_file_id_from_sbuf(conn, &sbuf1);
 		files_struct *dst_fsp = file_find_di_first(fileid);


-- 
Samba Shared Repository