Attachment 10744 Details for Bug 11103 – Possible patch for master/4.2.0

[patch] Possible patch for master/4.2.0

look (text/plain), 1.14 KB, created by Jeremy Allison on 2015-02-19 00:38:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2015-02-19 00:38:49 UTC

Size: 1.14 KB

patch

obsolete

>diff --git a/source3/smbd/smb2_negprot.c b/source3/smbd/smb2_negprot.c
>index 9a1ca9c..02f6882 100644
>--- a/source3/smbd/smb2_negprot.c
>+++ b/source3/smbd/smb2_negprot.c
>@@ -221,7 +221,8 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req)
> 	}
> 
> 	security_mode = SMB2_NEGOTIATE_SIGNING_ENABLED;
>-	if (lp_server_signing() == SMB_SIGNING_REQUIRED) {
>+	if (lp_server_signing() == SMB_SIGNING_REQUIRED ||
>+			(in_security_mode & SMB2_NEGOTIATE_SIGNING_REQUIRED)) {
> 		security_mode |= SMB2_NEGOTIATE_SIGNING_REQUIRED;
> 	}
> 
>diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c
>index 2f58e44..f918328 100644
>--- a/source3/smbd/smb2_sesssetup.c
>+++ b/source3/smbd/smb2_sesssetup.c
>@@ -186,7 +186,9 @@ static NTSTATUS smbd_smb2_auth_generic_return(struct smbXsrv_session *session,
> 	struct smbXsrv_connection *xconn = smb2req->xconn;
> 
> 	if ((in_security_mode & SMB2_NEGOTIATE_SIGNING_REQUIRED) ||
>-	    lp_server_signing() == SMB_SIGNING_REQUIRED) {
>+	    lp_server_signing() == SMB_SIGNING_REQUIRED ||
>+	    (xconn->smb2.server.security_mode &
>+			SMB2_NEGOTIATE_SIGNING_REQUIRED)) {
> 		x->global->signing_required = true;
> 	}
>

Actions: View

Attachments on bug 11103: 10744 | 10745 | 10746 | 10755 | 10756 | 10759