Changeset 223 for branches/samba-3.3.x/source/libsmb/clitrans.c

Timestamp:

May 24, 2009, 7:51:24 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.3

File:

• branches/samba-3.3.x/source/libsmb/clitrans.c (modified) (3 diffs)

branches/samba-3.3.x/source/libsmb/clitrans.c

@@ -113 +113 @@
                         this_ldata = MIN(ldata-tot_data,cli->max_xmit - (500+this_lparam));
 
-                        client_set_trans_sign_state_off(cli, mid);
-                        client_set_trans_sign_state_on(cli, mid);
-
                         cli_set_message(cli->outbuf,trans==SMBtrans?8:9,0,True);
                         SCVAL(cli->outbuf,smb_com,(trans==SMBtrans ? SMBtranss : SMBtranss2));
@@ -139 +136 @@
                         cli_setup_bcc(cli, outdata+this_ldata);
 
-                        /*
-                         * Save the mid we're using. We need this for finding
-                         * signing replies.
-                         */
-                        mid = cli->mid;
-
                         show_msg(cli->outbuf);
+
+                        client_set_trans_sign_state_off(cli, mid);
+                        cli->mid = mid;
                         if (!cli_send_smb(cli)) {
-                                client_set_trans_sign_state_off(cli, mid);
                                 return False;
                         }
-
-                        /* Ensure we use the same mid for the secondaries. */
-                        cli->mid = mid;
+                        client_set_trans_sign_state_on(cli, mid);
 
                         tot_data += this_ldata;
@@ -462 +453 @@
                         cli_setup_bcc(cli, outdata+this_ldata);
 
-                        /*
-                         * Save the mid we're using. We need this for finding
-                         * signing replies.
-                         */
-                        mid = cli->mid;
-
                         show_msg(cli->outbuf);
 
+                        client_set_trans_sign_state_off(cli, mid);
+                        cli->mid = mid;
                         if (!cli_send_smb(cli)) {
-                                client_set_trans_sign_state_off(cli, mid);
                                 return False;
                         }
-
-                        /* Ensure we use the same mid for the secondaries. */
-                        cli->mid = mid;
+                        client_set_trans_sign_state_on(cli, mid);
 
                         tot_data += this_ldata;