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

Timestamp:

May 27, 2009, 11:39:15 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.9

File:

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

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

@@ -1194 +1194 @@
         bool posix_open = False;
         bool new_file_created = False;
+        bool clear_ads = false;
         struct file_id id;
         NTSTATUS fsp_open = NT_STATUS_ACCESS_DENIED;
@@ -1326 +1327 @@
                          * exist create. */
                         flags2 |= (O_CREAT | O_TRUNC);
+                        clear_ads = true;
                         break;
 
@@ -1332 +1334 @@
                          * exist create. */
                         flags2 |= (O_CREAT | O_TRUNC);
+                        clear_ads = true;
                         break;
 
@@ -1356 +1359 @@
                         }
                         flags2 |= O_TRUNC;
+                        clear_ads = true;
                         break;
 
@@ -1787 +1791 @@
 
         SMB_ASSERT(lck != NULL);
+
+        /* Delete streams if create_disposition requires it */
+        if (file_existed && clear_ads && !is_ntfs_stream_name(fname)) {
+                status = delete_all_streams(conn, fname);
+                if (!NT_STATUS_IS_OK(status)) {
+                        TALLOC_FREE(lck);
+                        fd_close(fsp);
+                        return status;
+                }
+        }
 
         /* note that we ignore failure for the following. It is