Changeset 233 for branches/samba-3.2.x/source/smbd/close.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/close.c (modified) (4 diffs)

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

@@ -168 +168 @@
 ****************************************************************************/
 
-static NTSTATUS delete_all_streams(connection_struct *conn, const char *fname)
+NTSTATUS delete_all_streams(connection_struct *conn, const char *fname)
 {
         struct stream_struct *stream_info;
@@ -468 +468 @@
         struct timespec ts[2];
         NTSTATUS status;
+        int ret = -1;
 
         ZERO_STRUCT(sbuf);
@@ -482 +483 @@
         /* Ensure we have a valid stat struct for the source. */
         if (fsp->fh->fd != -1) {
-                if (SMB_VFS_FSTAT(fsp, &sbuf) == -1) {
-                        return map_nt_error_from_unix(errno);
-                }
+                ret = SMB_VFS_FSTAT(fsp, &sbuf);
         } else {
-                if (SMB_VFS_STAT(fsp->conn,fsp->fsp_name,&sbuf) == -1) {
-                        return map_nt_error_from_unix(errno);
-                }
+                if (fsp->posix_open) {
+                        ret = SMB_VFS_LSTAT(fsp->conn,fsp->fsp_name,&sbuf);
+                } else {
+                        ret = SMB_VFS_STAT(fsp->conn,fsp->fsp_name,&sbuf);
+                }
+        }
+
+        if (ret == -1) {
+                return map_nt_error_from_unix(errno);
         }
 
@@ -576 +581 @@
 
         saved_status4 = update_write_time_on_close(fsp);
+        if (NT_STATUS_EQUAL(saved_status4, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
+                /* Someone renamed the file or a parent directory containing
+                 * this file. We can't do anything about this, we don't have
+                 * an "update timestamp by fd" call in POSIX. Eat the error. */
+
+                saved_status4 = NT_STATUS_OK;
+        }
 
         if (NT_STATUS_IS_OK(status)) {