diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-10-13 11:07:01 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-10-16 19:30:04 +0200 |
| commit | 1ed30a6ba7beab8cd3a4a1cfce3724cdc61dbcab (patch) | |
| tree | 40c011c288202e28ad0fd89619412efb9d67ecde | |
| parent | b4604590b0f4c485e6c283070c36678b2bf9f052 (diff) | |
| download | samba-1ed30a6ba7beab8cd3a4a1cfce3724cdc61dbcab.tar.gz samba-1ed30a6ba7beab8cd3a4a1cfce3724cdc61dbcab.tar.xz samba-1ed30a6ba7beab8cd3a4a1cfce3724cdc61dbcab.zip | |
s3:smb2_server: check xconn->smb2.server.cipher instead of xconn->smb2.server.capabilities
SMB 3.10 and later won't have SMB2_CAP_ENCRYPTION anymore.
xconn->smb2.server.cipher == 0 is the indication that we don't support encryption on the connection.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
| -rw-r--r-- | source3/smbd/smb2_server.c | 2 | ||||
| -rw-r--r-- | source3/smbd/smb2_sesssetup.c | 2 | ||||
| -rw-r--r-- | source3/smbd/smb2_tcon.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c index 7100208780..0150d0c3f4 100644 --- a/source3/smbd/smb2_server.c +++ b/source3/smbd/smb2_server.c @@ -356,7 +356,7 @@ static NTSTATUS smbd_smb2_inbuf_parse_compound(struct smbXsrv_connection *xconn, goto inval; } - if (!(xconn->smb2.server.capabilities & SMB2_CAP_ENCRYPTION)) { + if (xconn->smb2.server.cipher == 0) { DEBUG(10, ("Got SMB2_TRANSFORM header, " "but not negotiated " "client[0x%08X] server[0x%08X]\n", diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c index 366ca586fc..78cafe8f78 100644 --- a/source3/smbd/smb2_sesssetup.c +++ b/source3/smbd/smb2_sesssetup.c @@ -208,7 +208,7 @@ static NTSTATUS smbd_smb2_auth_generic_return(struct smbXsrv_session *session, return NT_STATUS_ACCESS_DENIED; } - if (!(xconn->smb2.server.capabilities & SMB2_CAP_ENCRYPTION)) { + if (xconn->smb2.server.cipher == 0) { if (x->global->encryption_required) { DEBUG(1,("reject session with dialect[0x%04X] " "as encryption is required\n", diff --git a/source3/smbd/smb2_tcon.c b/source3/smbd/smb2_tcon.c index 278fb6fa3d..bf33fcbf72 100644 --- a/source3/smbd/smb2_tcon.c +++ b/source3/smbd/smb2_tcon.c @@ -249,7 +249,7 @@ static NTSTATUS smbd_smb2_tree_connect(struct smbd_smb2_request *req, return NT_STATUS_ACCESS_DENIED; } - if (!(conn->smb2.server.capabilities & SMB2_CAP_ENCRYPTION)) { + if (conn->smb2.server.cipher == 0) { if (encryption_required) { DEBUG(1,("reject tcon with dialect[0x%04X] " "as encryption is required for service %s\n", |