cifs: have decode_negTokenInit set flags in server struct
...rather than the secType. This allows us to get rid of the MSKerberos securityEnum. The client just makes a decision at upcall time. Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
This commit is contained in:

committed by
Steve French

parent
198b568278
commit
26efa0bac9
@@ -597,13 +597,19 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
|
||||
server->secType = RawNTLMSSP;
|
||||
} else {
|
||||
rc = decode_negTokenInit(pSMBr->u.extended_response.
|
||||
SecurityBlob,
|
||||
count - 16,
|
||||
&server->secType);
|
||||
SecurityBlob, count - 16,
|
||||
server);
|
||||
if (rc == 1)
|
||||
rc = 0;
|
||||
else
|
||||
rc = -EINVAL;
|
||||
|
||||
if (server->sec_kerberos || server->sec_mskerberos)
|
||||
server->secType = Kerberos;
|
||||
else if (server->sec_ntlmssp)
|
||||
server->secType = RawNTLMSSP;
|
||||
else
|
||||
rc = -EOPNOTSUPP;
|
||||
}
|
||||
} else
|
||||
server->capabilities &= ~CAP_EXTENDED_SECURITY;
|
||||
|
Reference in New Issue
Block a user