diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-08-19 19:35:33 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-08-19 19:35:33 +0000 |
| commit | c16fefa56334e8d0197492607e473fdbb813073f (patch) | |
| tree | 8dc227ea6a712939ce216dd93746dc9baa4ee13f /fs/cifs/sess.c | |
| parent | cb7691b648bddbfaf6dd8d8068273dbb18d2484c (diff) | |
| download | linux-c16fefa56334e8d0197492607e473fdbb813073f.tar.gz linux-c16fefa56334e8d0197492607e473fdbb813073f.tar.bz2 linux-c16fefa56334e8d0197492607e473fdbb813073f.zip | |
[CIFS] distinguish between Kerberos and MSKerberos in upcall
Properly handle MSKRB5 by passing sec=mskrb5 to the upcall so that the
spengo blob can be generated appropriately. Also, make
decode_negTokenInit prefer whichever mechanism is first in the list.
Needed for some NetApp servers, and possibly some older
versions of Windows which treat the two KRB5 mechanisms differently.
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 ed150efbe27c..3188e4d9cddb 100644 --- a/fs/cifs/sess.c +++ b/fs/cifs/sess.c @@ -505,7 +505,7 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time, unicode_ssetup_strings(&bcc_ptr, ses, nls_cp); } else ascii_ssetup_strings(&bcc_ptr, ses, nls_cp); - } else if (type == Kerberos) { + } else if (type == Kerberos || type == MSKerberos) { #ifdef CONFIG_CIFS_UPCALL struct cifs_spnego_msg *msg; spnego_key = cifs_get_spnego_key(ses); |