[SCM] Samba Shared Repository - branch master updated - e6a2ce970bf24a1ff588ee2f492e47b88145992f

[Jeremy Allison]

The branch, master has been updated
       via  e6a2ce970bf24a1ff588ee2f492e47b88145992f (commit)
      from  0b169748ce879ce7a1b6b9d9d4f4bc9b1b7045e0 (commit)

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


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

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

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

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


Changeset truncated at 500 lines:

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index a1833b5..11c713a 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -5496,6 +5496,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