Changeset 740 for vendor/current/source4/smb_server/smb2/receive.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source4/smb_server/smb2/receive.c (modified) (2 diffs)

vendor/current/source4/smb_server/smb2/receive.c ¶

@@ -323 +323 @@
         flags                   = IVAL(req->in.hdr, SMB2_HDR_FLAGS);
 
-        if (req->smb_conn->highest_smb2_seqnum != 0 &&
+        if (opcode != SMB2_OP_CANCEL &&
+            req->smb_conn->highest_smb2_seqnum != 0 &&
             req->seqnum <= req->smb_conn->highest_smb2_seqnum) {
                 smbsrv_terminate_connection(req->smb_conn, "Invalid SMB2 sequence number");
                 return NT_STATUS_INVALID_PARAMETER;
         }
-        req->smb_conn->highest_smb2_seqnum = req->seqnum;
-        
+        if (opcode != SMB2_OP_CANCEL) {
+                req->smb_conn->highest_smb2_seqnum = req->seqnum;
+        }
+
         req->session    = smbsrv_session_find(req->smb_conn, uid, req->request_time);
         req->tcon       = smbsrv_smb2_tcon_find(req->session, tid, req->request_time);
@@ -657 +660 @@
         /* this is the size that w2k uses, and it appears to be important for
            good performance */
-        smb_conn->negotiate.max_recv = lp_max_xmit(smb_conn->lp_ctx);
+        smb_conn->negotiate.max_recv = lpcfg_max_xmit(smb_conn->lp_ctx);
 
         smb_conn->negotiate.zone_offset = get_time_zone(time(NULL));