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

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

@@ -749 +749 @@
                                     + data_alignment_offset);
 
-        /* useable_space can never be more than max_send minus the alignment offset. */
-
-        useable_space = MIN(useable_space, max_send - (alignment_offset+data_alignment_offset));
+        if (useable_space < 0) {
+                DEBUG(0, ("send_trans2_replies failed sanity useable_space "
+                          "= %d!!!", useable_space));
+                exit_server_cleanly("send_trans2_replies: Not enough space");
+        }
 
         while (params_to_send || data_to_send) {
                 /* Calculate whether we will totally or partially fill this packet */
 
-                total_sent_thistime = params_to_send + data_to_send + alignment_offset + data_alignment_offset;
+                total_sent_thistime = params_to_send + data_to_send;
 
                 /* We can never send more than useable_space */
@@ -766 +768 @@
                  */
 
-                total_sent_thistime = MIN(total_sent_thistime, useable_space+ alignment_offset + data_alignment_offset);
-
-                reply_outbuf(req, 10, total_sent_thistime);
+                total_sent_thistime = MIN(total_sent_thistime, useable_space);
+
+                reply_outbuf(req, 10, total_sent_thistime + alignment_offset
+                             + data_alignment_offset);
 
                 /* Set total params and data to be sent */
@@ -1947 +1950 @@
                 case SMB_FIND_FILE_UNIX:
                 case SMB_FIND_FILE_UNIX_INFO2:
+                        /* Always use filesystem for UNIX mtime query. */
+                        ask_sharemode = false;
                         if (!lp_unix_extensions()) {
                                 reply_nterror(req, NT_STATUS_INVALID_LEVEL);
@@ -2304 +2309 @@
                 case SMB_FIND_FILE_UNIX:
                 case SMB_FIND_FILE_UNIX_INFO2:
+                        /* Always use filesystem for UNIX mtime query. */
+                        ask_sharemode = false;
                         if (!lp_unix_extensions()) {
                                 reply_nterror(req, NT_STATUS_INVALID_LEVEL);
@@ -4141 +4148 @@
         }
 
-        if (!null_timespec(write_time_ts)) {
+        if (!null_timespec(write_time_ts) && !INFO_LEVEL_IS_UNIX(info_level)) {
                 mtime_ts = write_time_ts;
         }
@@ -4896 +4903 @@
 
                 if (fsp != NULL) {
-                        set_write_time_fsp(fsp, ts[1], true);
+                        set_sticky_write_time_fsp(fsp, ts[1]);
                 } else {
-                        set_write_time_path(conn, fname,
+                        set_sticky_write_time_path(conn, fname,
                                             vfs_file_id_from_sbuf(conn, psbuf),
-                                            ts[1], true);
+                                            ts[1]);
                 }
         }
@@ -4992 +4999 @@
                         return map_nt_error_from_unix(errno);
                 }
+                trigger_write_time_update_immediate(fsp);
                 return NT_STATUS_OK;
         }
@@ -5015 +5023 @@
         }
 
+        trigger_write_time_update_immediate(new_fsp);
         close_file(new_fsp,NORMAL_CLOSE);
         return NT_STATUS_OK;
@@ -5740 +5749 @@
                  * if there are no pending writes.
                  */
-                trigger_write_time_update(fsp);
+                trigger_write_time_update_immediate(fsp);
                 return NT_STATUS_OK;
         }
@@ -5774 +5783 @@
          * if there are no pending writes.
          */
-        trigger_write_time_update(new_fsp);
+        trigger_write_time_update_immediate(new_fsp);
 
         close_file(new_fsp,NORMAL_CLOSE);