[SCM] Samba Shared Repository - branch master updated - 458101b5776057549b35181a75b745604ae47d48

[Jeremy Allison]

The branch, master has been updated
       via  458101b5776057549b35181a75b745604ae47d48 (commit)
      from  9c455879f02606127686cde50552af53ccff8cb8 (commit)

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


- Log -----------------------------------------------------------------
commit 458101b5776057549b35181a75b745604ae47d48
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Sep 15 14:21:28 2008 -0700

    Fix bug 5761 "open of mangled directory name results in 'is a stream name'"
    reported by Regan Heath <Regan.Heath at BridgeHeadSoftware.com>.
    Jeremy.

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

Summary of changes:
 source3/smbd/open.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 8b32907..7119147 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1852,7 +1852,8 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
 
 	/* Handle strange delete on close create semantics. */
 	if ((create_options & FILE_DELETE_ON_CLOSE)
-	    && (is_ntfs_stream_name(fname)
+	    && (((conn->fs_capabilities & FILE_NAMED_STREAMS)
+			&& is_ntfs_stream_name(fname))
 		|| can_set_initial_delete_on_close(lck))) {
 		status = can_set_delete_on_close(fsp, True, new_dos_attributes);
 
@@ -2116,7 +2117,9 @@ NTSTATUS open_directory(connection_struct *conn,
 		 (unsigned int)create_disposition,
 		 (unsigned int)file_attributes));
 
-	if (!(file_attributes & FILE_FLAG_POSIX_SEMANTICS) && is_ntfs_stream_name(fname)) {
+	if (!(file_attributes & FILE_FLAG_POSIX_SEMANTICS) &&
+			(conn->fs_capabilities & FILE_NAMED_STREAMS) &&
+			is_ntfs_stream_name(fname)) {
 		DEBUG(2, ("open_directory: %s is a stream name!\n", fname));
 		return NT_STATUS_NOT_A_DIRECTORY;
 	}
@@ -2907,7 +2910,8 @@ NTSTATUS create_file(connection_struct *conn,
 			 * Check to see if this is a mac fork of some kind.
 			 */
 
-			if (is_ntfs_stream_name(fname)) {
+			if ((conn->fs_capabilities & FILE_NAMED_STREAMS) &&
+					is_ntfs_stream_name(fname)) {
 				status = NT_STATUS_OBJECT_PATH_NOT_FOUND;
 				goto fail;
 			}


-- 
Samba Shared Repository