The branch, master has been updated
via b62964d... s4:smb_server/smb2: don't reset highest_smb2_seqnum on
SMB2 Cancel
from f6ecb4e... s4-torture: fixed expected error codes for s4 in
SMB2-LOCK
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b62964d6feb47ccf14e3d14120c04bc435c47cbd
Author: Stefan Metzmacher <[email protected]>
Date: Thu Nov 26 14:18:50 2009 +0100
s4:smb_server/smb2: don't reset highest_smb2_seqnum on SMB2 Cancel
metze
-----------------------------------------------------------------------
Summary of changes:
source4/smb_server/smb2/receive.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/smb_server/smb2/receive.c
b/source4/smb_server/smb2/receive.c
index d26be41..26995b7 100644
--- a/source4/smb_server/smb2/receive.c
+++ b/source4/smb_server/smb2/receive.c
@@ -328,8 +328,10 @@ static NTSTATUS smb2srv_reply(struct smb2srv_request *req)
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);
--
Samba Shared Repository
