summaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
authorSteve French <smfrench@gmail.com>2014-10-20 12:48:23 -0500
committerSteve French <steve.french@primarydata.com>2014-12-07 22:17:19 -0600
commitebdd207e29164d5de70d2b027b8a3a14c603d42c (patch)
treec5772182c79c09ce32971ecd4bc5e78355e37dbd /fs/cifs
parent911a8dfa47a45ff52d771a5b4162ce3b1e55b33d (diff)
downloadlinux-ebdd207e29164d5de70d2b027b8a3a14c603d42c.tar.bz2
decode_negTokenInit had wrong calling sequence
For krb5 enablement of SMB3, decoding negprot, caller now passes server struct not the old sec_type
Diffstat (limited to 'fs/cifs')
-rw-r--r--fs/cifs/smb2pdu.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index 8f1672bb82d5..0ca7f6364754 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -431,8 +431,7 @@ SMB2_negotiate(const unsigned int xid, struct cifs_ses *ses)
if (rc)
goto neg_exit;
if (blob_length)
- rc = decode_neg_token_init(security_blob, blob_length,
- &server->sec_type);
+ rc = decode_negTokenInit(security_blob, blob_length, server);
if (rc == 1)
rc = 0;
else if (rc == 0) {