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

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

@@ -114 +114 @@
                                     + 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_nt_replies failed sanity useable_space "
+                          "= %d!!!", useable_space));
+                exit_server_cleanly("send_nt_replies: srv_send_smb failed.");
+        }
 
         while (params_to_send || data_to_send) {
@@ -129 +126 @@
                  */
 
-                total_sent_thistime = params_to_send + data_to_send +
-                                        alignment_offset + data_alignment_offset;
+                total_sent_thistime = params_to_send + data_to_send;
 
                 /*
@@ -138 +134 @@
                 total_sent_thistime = MIN(total_sent_thistime, useable_space);
 
-                reply_outbuf(req, 18, total_sent_thistime);
+                reply_outbuf(req, 18,
+                             total_sent_thistime + alignment_offset
+                             + data_alignment_offset);
 
                 /*
@@ -265 +263 @@
                         DEBUG(0,("send_nt_replies failed sanity check pts = %d, dts = %d\n!!!",
                                 params_to_send, data_to_send));
-                        return;
+                        exit_server_cleanly("send_nt_replies: internal error");
                 }
         }
@@ -489 +487 @@
                         (unsigned int)root_dir_fid,
                         fname));
+
+        /*
+         * we need to remove ignored bits when they come directly from the client
+         * because we reuse some of them for internal stuff
+         */
+        create_options &= ~NTCREATEX_OPTIONS_MUST_IGNORE_MASK;
 
         /*
@@ -900 +904 @@
 #endif
 
+        /*
+         * we need to remove ignored bits when they come directly from the client
+         * because we reuse some of them for internal stuff
+         */
+        create_options &= ~NTCREATEX_OPTIONS_MUST_IGNORE_MASK;
+
         /* Ensure the data_len is correct for the sd and ea values given. */
         if ((ea_len + sd_len > data_count)