Changeset 165 for branches/samba-3.0/source/smbd/reply.c

Timestamp:

Mar 11, 2009, 9:14:55 AM (16 years ago)

Author:

Paul Smedley

Message:

Add 'missing' 3.0.34 diffs

File:

• branches/samba-3.0/source/smbd/reply.c (modified) (3 diffs)

branches/samba-3.0/source/smbd/reply.c

@@ -169 +169 @@
 
         *d = '\0';
-
         return ret;
 }
@@ -2215 +2214 @@
 
                 if ( SMB_VFS_SENDFILE( smbd_server_fd(), fsp, fsp->fh->fd, &header, startpos, nread) == -1) {
-                        /* Returning ENOSYS means no data at all was sent. Do this as a normal read. */
+                        /* Returning ENOSYS means no data at all was sent.
+                           Do this as a normal read. */
                         if (errno == ENOSYS) {
                                 goto normal_readbraw;
@@ -4645 +4645 @@
                         DEBUG(3,("rename_internals: succeeded doing rename "
                                  "on %s -> %s\n", directory, newname));
+                        notify_rename(conn, S_ISDIR(sbuf1.st_mode),
+                                      directory, newname);
                         rename_open_files(conn, lck, sbuf1.st_dev,
                                           sbuf1.st_ino, newname);
                         TALLOC_FREE(lck);
-                        notify_rename(conn, S_ISDIR(sbuf1.st_mode),
-                                      directory, newname);
                         return NT_STATUS_OK;    
                 }