diff options
| author | Ralph Boehme <slow@samba.org> | 2015-11-09 17:23:29 +0100 |
|---|---|---|
| committer | Ralph Boehme <slow@samba.org> | 2016-01-22 07:52:20 +0100 |
| commit | bfdffea0fa8e6af57c2b3e51472bab46d46fbaca (patch) | |
| tree | 99169b5241aff3134ac6538dbc085575a2cfe21c /source3/smbd/smb2_tcon.c | |
| parent | 63a13f40cfe31c58c57373ae384b3c067a4d5498 (diff) | |
| download | samba-bfdffea0fa8e6af57c2b3e51472bab46d46fbaca.tar.gz | |
s3:smb2_server: convert encryption desired and required bools to flags
This adds a bitmap smbXsrv_encrpytion_flags with flags to the
smbXsrv_session_global.tdb and smbXsrv_tcon_global.tdb that we use
instead of bools for desired and required.
We need this info in the smbXsrv tdbs for smbstatus. Subsequent commits
for smbstatus will use it.
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/smbd/smb2_tcon.c')
| -rw-r--r-- | source3/smbd/smb2_tcon.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source3/smbd/smb2_tcon.c b/source3/smbd/smb2_tcon.c index 99e2f215ca4..61e2a3636d3 100644 --- a/source3/smbd/smb2_tcon.c +++ b/source3/smbd/smb2_tcon.c @@ -193,8 +193,8 @@ static NTSTATUS smbd_smb2_tree_connect(struct smbd_smb2_request *req, connection_struct *compat_conn = NULL; struct user_struct *compat_vuser = req->session->compat; NTSTATUS status; - bool encryption_desired = req->session->encryption_desired; - bool encryption_required = req->session->global->encryption_required; + bool encryption_desired = req->session->global->encryption_flags & SMBXSRV_ENCRYPTION_DESIRED; + bool encryption_required = req->session->global->encryption_flags & SMBXSRV_ENCRYPTION_REQUIRED; bool guest_session = false; bool require_signed_tcon = false; @@ -298,8 +298,12 @@ static NTSTATUS smbd_smb2_tree_connect(struct smbd_smb2_request *req, return status; } - tcon->encryption_desired = encryption_desired; - tcon->global->encryption_required = encryption_required; + if (encryption_desired) { + tcon->global->encryption_flags |= SMBXSRV_ENCRYPTION_DESIRED; + } + if (encryption_required) { + tcon->global->encryption_flags |= SMBXSRV_ENCRYPTION_REQUIRED; + } compat_conn = make_connection_smb2(req, tcon, snum, |