From: Steve French <smfrench@gmail.com>
Date: Mon, 20 Oct 2014 17:48:23 +0000 (-0500)
Subject: decode_negTokenInit had wrong calling sequence
X-Git-Tag: v3.19-rc1~140^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ebdd207e29164d5de70d2b027b8a3a14c603d42c;p=thirdparty%2Fkernel%2Flinux.git

decode_negTokenInit had wrong calling sequence

For krb5 enablement of SMB3, decoding negprot, caller now passes
server struct not the old sec_type
---

diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index 8f1672bb82d56..0ca7f63647544 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) {