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

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

@@ -3169 +3169 @@
 
                 if ((nread = SMB_VFS_SENDFILE(smbd_server_fd(), fsp, &header, startpos, smb_maxcnt)) == -1) {
-                        /* Returning ENOSYS means no data at all was sent. Do this as a normal read. */
-                        if (errno == ENOSYS) {
+                        /* Returning ENOSYS or EINVAL means no data at all was sent. 
+                           Do this as a normal read. */
+                        if (errno == ENOSYS || errno == EINVAL) {
                                 goto normal_read;
                         }
@@ -3783 +3784 @@
                         return;
                 }
-        } else
+                trigger_write_time_update_immediate(fsp);
+        } else {
                 nwritten = write_file(req,fsp,data,startpos,numtowrite);
-  
+        }
+
         status = sync_file(conn, fsp, False);
         if (!NT_STATUS_IS_OK(status)) {
@@ -7097 +7100 @@
         int mode;
         files_struct *fsp;
+        struct timespec create_ts;
 
         START_PROFILE(SMBgetattrE);
@@ -7131 +7135 @@
         reply_outbuf(req, 11, 0);
 
-        srv_put_dos_date2((char *)req->outbuf, smb_vwv0,
-                          get_create_time(&sbuf,
-                                          lp_fake_dir_create_times(SNUM(conn))));
+        create_ts = get_create_timespec(&sbuf,
+                                  lp_fake_dir_create_times(SNUM(conn)));
+        srv_put_dos_date2((char *)req->outbuf, smb_vwv0, create_ts.tv_sec);
         srv_put_dos_date2((char *)req->outbuf, smb_vwv2, sbuf.st_atime);
         /* Should we check pending modtime here ? JRA */