diff options
| author | Aurelien Aptel <aaptel@suse.com> | 2019-09-20 06:22:14 +0200 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2019-11-25 01:16:30 -0600 |
| commit | f6a6bf7c4d53837767125e635e7d7d0dc48ee59e (patch) | |
| tree | de39238ea6e7e483515f744a97c05e70decb7b9c /fs/cifs/sess.c | |
| parent | f780bd3fef17c4fda12e9c50e28e91c0e18cf448 (diff) | |
| download | linux-f6a6bf7c4d53837767125e635e7d7d0dc48ee59e.tar.gz linux-f6a6bf7c4d53837767125e635e7d7d0dc48ee59e.tar.bz2 linux-f6a6bf7c4d53837767125e635e7d7d0dc48ee59e.zip | |
cifs: switch servers depending on binding state
Currently a lot of the code to initialize a connection & session uses
the cifs_ses as input. But depending on if we are opening a new session
or a new channel we need to use different server pointers.
Add a "binding" flag in cifs_ses and a helper function that returns
the server ptr a session should use (only in the sess establishment
code path).
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Diffstat (limited to 'fs/cifs/sess.c')
| -rw-r--r-- | fs/cifs/sess.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c index 85bd644f9773..bb3e506435de 100644 --- a/fs/cifs/sess.c +++ b/fs/cifs/sess.c @@ -342,6 +342,7 @@ int decode_ntlmssp_challenge(char *bcc_ptr, int blob_len, void build_ntlmssp_negotiate_blob(unsigned char *pbuffer, struct cifs_ses *ses) { + struct TCP_Server_Info *server = cifs_ses_server(ses); NEGOTIATE_MESSAGE *sec_blob = (NEGOTIATE_MESSAGE *)pbuffer; __u32 flags; @@ -354,9 +355,9 @@ void build_ntlmssp_negotiate_blob(unsigned char *pbuffer, NTLMSSP_NEGOTIATE_128 | NTLMSSP_NEGOTIATE_UNICODE | NTLMSSP_NEGOTIATE_NTLM | NTLMSSP_NEGOTIATE_EXTENDED_SEC | NTLMSSP_NEGOTIATE_SEAL; - if (ses->server->sign) + if (server->sign) flags |= NTLMSSP_NEGOTIATE_SIGN; - if (!ses->server->session_estab || ses->ntlmssp->sesskey_per_smbsess) + if (!server->session_estab || ses->ntlmssp->sesskey_per_smbsess) flags |= NTLMSSP_NEGOTIATE_KEY_XCH; sec_blob->NegotiateFlags = cpu_to_le32(flags); |