Changeset 232 for branches/samba-3.2.x/source/smbd/reply.c

Timestamp:

May 27, 2009, 9:09:42 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.8

File:

• branches/samba-3.2.x/source/smbd/reply.c (modified) (9 diffs)

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

@@ -2363 +2363 @@
 
         if (!NT_STATUS_IS_OK(status)) {
-                DEBUG(10, ("open_file_ntcreate failed: %s\n",
+                DEBUG(10, ("create_file_unixpath failed: %s\n",
                            nt_errstr(status)));
                 return status;
@@ -3203 +3203 @@
 
                 if ((nread = SMB_VFS_SENDFILE(smbd_server_fd(), fsp, &header, startpos, smb_maxcnt)) == -1) {
-                        /* Returning ENOSYS or EINVAL means no data at all was sent. 
+                        /* Returning ENOSYS means no data at all was sent.
                            Do this as a normal read. */
-                        if (errno == ENOSYS || errno == EINVAL) {
+                        if (errno == ENOSYS) {
                                 goto normal_read;
                         }
@@ -3894 +3894 @@
                 return false;
         }
+        if (IS_PRINT(conn)) {
+                DEBUG(10,("is_valid_writeX_buffer: printing tid\n"));
+                return false;
+        }
         doff = SVAL(inbuf,smb_vwv11);
 
@@ -4634 +4638 @@
         files_struct *fsp;
         NTSTATUS status;
+        SMB_STRUCT_STAT sbuf;
 
         START_PROFILE(SMBsplopen);
@@ -4657 +4662 @@
 
         /* Open for exclusive use, write only. */
-        status = print_fsp_open(conn, NULL, fsp);
+        status = print_fsp_open(conn, NULL, fsp, &sbuf);
 
         if (!NT_STATUS_IS_OK(status)) {
@@ -5476 +5481 @@
         NTSTATUS status = NT_STATUS_OK;
         struct share_mode_lock *lck = NULL;
-        bool dst_exists;
+        bool dst_exists, old_is_stream, new_is_stream;
 
         ZERO_STRUCT(sbuf);
@@ -5545 +5550 @@
         }
 
+        old_is_stream = is_ntfs_stream_name(fsp->fsp_name);
+        new_is_stream = is_ntfs_stream_name(newname);
+
+        /* Return the correct error code if both names aren't streams. */
+        if (!old_is_stream && new_is_stream) {
+                return NT_STATUS_OBJECT_NAME_INVALID;
+        }
+
+        if (old_is_stream && !new_is_stream) {
+                return NT_STATUS_INVALID_PARAMETER;
+        }
+
         /*
          * Have vfs_object_exist also fill sbuf1
@@ -5556 +5573 @@
         }
 
-        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);
-                if (dst_fsp) {
+                /* The file can be open when renaming a stream */
+                if (dst_fsp && !new_is_stream) {
                         DEBUG(3, ("rename_internals_fsp: Target file open\n"));
                         return NT_STATUS_ACCESS_DENIED;
@@ -5624 +5636 @@
                  * depends on these semantics. JRA.
                  */
-
-                set_allow_initial_delete_on_close(lck, fsp, True);
 
                 if (create_options & FILE_DELETE_ON_CLOSE) {