The branch, master has been updated
via b3385f7 smbd: Make SMB3 clients use encryption with "smb encrypt =
auto"
from a3adad7 waf: Fix the build on openbsd
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b3385f74db54bd8a07a0be5515151b633c067da4
Author: Volker Lendecke <[email protected]>
Date: Wed Feb 25 16:59:26 2015 +0100
smbd: Make SMB3 clients use encryption with "smb encrypt = auto"
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Stefan Metzmacher <[email protected]>
Autobuild-User(master): Volker Lendecke <[email protected]>
Autobuild-Date(master): Tue Mar 3 10:40:42 CET 2015 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/smb2_sesssetup.c | 5 +++++
source3/smbd/smb2_tcon.c | 5 +++++
2 files changed, 10 insertions(+)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c
index 2f58e44..fb7edce 100644
--- a/source3/smbd/smb2_sesssetup.c
+++ b/source3/smbd/smb2_sesssetup.c
@@ -190,6 +190,11 @@ static NTSTATUS smbd_smb2_auth_generic_return(struct
smbXsrv_session *session,
x->global->signing_required = true;
}
+ if ((lp_smb_encrypt(-1) > SMB_SIGNING_OFF) &&
+ (xconn->smb2.client.capabilities & SMB2_CAP_ENCRYPTION)) {
+ x->global->encryption_required = true;
+ }
+
if (lp_smb_encrypt(-1) == SMB_SIGNING_REQUIRED) {
x->global->encryption_required = true;
}
diff --git a/source3/smbd/smb2_tcon.c b/source3/smbd/smb2_tcon.c
index bf33fcb..cf085a5 100644
--- a/source3/smbd/smb2_tcon.c
+++ b/source3/smbd/smb2_tcon.c
@@ -235,6 +235,11 @@ static NTSTATUS smbd_smb2_tree_connect(struct
smbd_smb2_request *req,
return NT_STATUS_BAD_NETWORK_NAME;
}
+ if ((lp_smb_encrypt(snum) > SMB_SIGNING_OFF) &&
+ (conn->smb2.client.capabilities & SMB2_CAP_ENCRYPTION)) {
+ encryption_required = true;
+ }
+
if (lp_smb_encrypt(snum) == SMB_SIGNING_REQUIRED) {
encryption_required = true;
}
--
Samba Shared Repository
