diff options
| author | Steve French <sfrench@us.ibm.com> | 2010-10-07 23:42:03 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-10-07 23:42:03 -0400 |
| 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 7e83b356cc9e..54bd83af772c 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c | |||
| @@ -620,13 +620,15 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses) | |||
| 620 | rc = 0; | 620 | rc = 0; |
| 621 | else | 621 | else |
| 622 | rc = -EINVAL; | 622 | rc = -EINVAL; |
| 623 | 623 | if (server->secType == Kerberos) { | |
| 624 | if (server->sec_kerberos || server->sec_mskerberos) | 624 | if (!server->sec_kerberos && |
| 625 | server->secType = Kerberos; | 625 | !server->sec_mskerberos) |
| 626 | else if (server->sec_ntlmssp) | 626 | rc = -EOPNOTSUPP; |
| 627 | server->secType = RawNTLMSSP; | 627 | } else if (server->secType == RawNTLMSSP) { |
| 628 | else | 628 | if (!server->sec_ntlmssp) |
| 629 | rc = -EOPNOTSUPP; | 629 | rc = -EOPNOTSUPP; |
| 630 | } else | ||
| 631 | rc = -EOPNOTSUPP; | ||
| 630 | } | 632 | } |
| 631 | } else | 633 | } else |
| 632 | server->capabilities &= ~CAP_EXTENDED_SECURITY; | 634 | server->capabilities &= ~CAP_EXTENDED_SECURITY; |