diff options
| author | Jeff Layton <jlayton@redhat.com> | 2010-04-24 07:57:49 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-05-05 23:24:11 +0000 |
| commit | 26efa0bac9dc3587ee8892c06642735bcded59e5 (patch) | |
| tree | 2d6d75ffa9671b972cadcbc62ed365e992ea247a /fs/cifs/sess.c | |
| parent | 198b5682781b97251afd9025dbf559a77969abdd (diff) | |
| download | linux-3.10-26efa0bac9dc3587ee8892c06642735bcded59e5.tar.gz linux-3.10-26efa0bac9dc3587ee8892c06642735bcded59e5.tar.bz2 linux-3.10-26efa0bac9dc3587ee8892c06642735bcded59e5.zip | |
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>
Diffstat (limited to 'fs/cifs/sess.c')
| -rw-r--r-- | fs/cifs/sess.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c index 84b92dfaf84..7707389bdf2 100644 --- a/fs/cifs/sess.c +++ b/fs/cifs/sess.c @@ -751,7 +751,7 @@ ssetup_ntlmssp_authenticate: unicode_ssetup_strings(&bcc_ptr, ses, nls_cp); } else ascii_ssetup_strings(&bcc_ptr, ses, nls_cp); - } else if (type == Kerberos || type == MSKerberos) { + } else if (type == Kerberos) { #ifdef CONFIG_CIFS_UPCALL struct cifs_spnego_msg *msg; spnego_key = cifs_get_spnego_key(ses); |