Attachment 10786 Details for Bug 11114 – trivial patch to correct rc mapping - fixes the 15 oplock test cases

[patch] trivial patch to correct rc mapping - fixes the 15 oplock test cases

oplock-rc-mapping-fix.patch (text/plain), 1.07 KB, created by Steve French on 2015-02-25 08:08:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve French

Created: 2015-02-25 08:08:49 UTC

Size: 1.07 KB

patch

obsolete

>diff --git a/source3/smbd/smb2_break.c b/source3/smbd/smb2_break.c
>index 5eab0a1..6ec918d 100644
>--- a/source3/smbd/smb2_break.c
>+++ b/source3/smbd/smb2_break.c
>@@ -74,8 +74,19 @@ NTSTATUS smbd_smb2_request_process_break(struct smbd_smb2_request *req)
> 
> 	/* Are we awaiting a break message ? */
> 	if (in_fsp->oplock_timeout == NULL) {
>-		return smbd_smb2_request_error(
>-			req, NT_STATUS_INVALID_OPLOCK_PROTOCOL);
>+		DEBUG(1, ("Invalid request: no oplock. in_oplock_level 0x%x lease type 0x%x\n", in_oplock_level, fsp_lease_type(in_fsp)));
>+		/* See MS-SMB2 3.3.5.22.1 */
>+		if (in_oplock_level == SMB2_OPLOCK_LEVEL_LEASE)
>+			return smbd_smb2_request_error(
>+				req, NT_STATUS_INVALID_PARAMETER);
>+		else if ((in_oplock_level == SMB2_OPLOCK_LEVEL_NONE) ||
>+			 ((in_oplock_level == SMB2_OPLOCK_LEVEL_II) &&
>+			  (fsp_lease_type(in_fsp) != SMB2_OPLOCK_LEVEL_II)))
>+			return smbd_smb2_request_error(
>+				req, NT_STATUS_INVALID_DEVICE_STATE);
>+		else
>+			return smbd_smb2_request_error(
>+				req, NT_STATUS_INVALID_OPLOCK_PROTOCOL);
> 	}
> 
> 	if (in_oplock_level != SMB2_OPLOCK_LEVEL_NONE &&

Actions: View

Attachments on bug 11114: 10770 | 10771 | 10772 | 10773 | 10774 | 10775 | 10776 | 10777 | 10779 | 10780 | 10781 | 10782 | 10783 | 10784 | 10785 | 10786