diff options
| author | Steve French <sfrench@us.ibm.com> | 2010-10-08 03:42:03 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-10-08 03:42:03 +0000 |
| commit | 6ea75952d7c671ea8b0d7b66f82afcafbb5d20c2 (patch) | |
| tree | 66cf5e73830d2730866f7e6bf6cf93f0684c5b99 /fs/cifs/cifssmb.c | |
| parent | 6b0cd00bc396daf5c2dcf17a8d82055335341f46 (diff) | |
| parent | d2445556137c38ae15d3191174bfd235630ed7cd (diff) | |
Merge branch 'for-next'
Diffstat (limited to 'fs/cifs/cifssmb.c')
| -rw-r--r-- | fs/cifs/cifssmb.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index 7e83b356cc9..54bd83af772 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c @@ -620,13 +620,15 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses) 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; + if (server->secType == Kerberos) { + if (!server->sec_kerberos && + !server->sec_mskerberos) + rc = -EOPNOTSUPP; + } else if (server->secType == RawNTLMSSP) { + if (!server->sec_ntlmssp) + rc = -EOPNOTSUPP; + } else + rc = -EOPNOTSUPP; } } else server->capabilities &= ~CAP_EXTENDED_SECURITY; |