From eb05766a8c539b1b7d8de8481686556f6bdcc6db Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 23 Feb 2015 10:15:05 -0800 Subject: [PATCH] Revert "s3: smbd: signing. Ensure we respond correctly to an SMB2 negprot with SMB2_NEGOTIATE_SIGNING_REQUIRED." Even though the MS-SMB2 spec says so, Windows doesn't behave like this. This reverts commit 1cea6e5b6f8c0e28d5ba2d296c831c4878fca304. Signed-off-by: Jeremy Allison Reviewed-by: "Stefan (metze) Metzmacher" --- source3/smbd/smb2_negprot.c | 3 +-- source3/smbd/smb2_sesssetup.c | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/source3/smbd/smb2_negprot.c b/source3/smbd/smb2_negprot.c index 02f688221a0..9a1ca9c22e3 100644 --- a/source3/smbd/smb2_negprot.c +++ b/source3/smbd/smb2_negprot.c @@ -221,8 +221,7 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req) } security_mode = SMB2_NEGOTIATE_SIGNING_ENABLED; - if (lp_server_signing() == SMB_SIGNING_REQUIRED || - (in_security_mode & SMB2_NEGOTIATE_SIGNING_REQUIRED)) { + if (lp_server_signing() == SMB_SIGNING_REQUIRED) { security_mode |= SMB2_NEGOTIATE_SIGNING_REQUIRED; } diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c index f9183285f38..2f58e44f55a 100644 --- a/source3/smbd/smb2_sesssetup.c +++ b/source3/smbd/smb2_sesssetup.c @@ -186,9 +186,7 @@ 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 || - (xconn->smb2.server.security_mode & - SMB2_NEGOTIATE_SIGNING_REQUIRED)) { + lp_server_signing() == SMB_SIGNING_REQUIRED) { x->global->signing_required = true; } -- 2.11.4.GIT