Changeset 204 for branches/samba-3.2.x/source/smbd/open.c

Timestamp:

May 20, 2009, 6:46:53 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.4

File:

• branches/samba-3.2.x/source/smbd/open.c (modified) (4 diffs)

branches/samba-3.2.x/source/smbd/open.c

@@ -1855 +1855 @@
         /* 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);
@@ -2119 +2120 @@
                  (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;
@@ -2612 +2615 @@
         if (create_options & FILE_OPEN_BY_FILE_ID) {
                 status = NT_STATUS_NOT_SUPPORTED;
+                goto fail;
+        }
+
+        if (create_options & NTCREATEX_OPTIONS_INVALID_PARAM_MASK) {
+                status = NT_STATUS_INVALID_PARAMETER;
                 goto fail;
         }
@@ -2957 +2965 @@
                          */
 
-                        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;