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/cifs_spnego.c | |
| parent | 198b5682781b97251afd9025dbf559a77969abdd (diff) | |
| download | kernel_samsung_smdk4412-26efa0bac9dc3587ee8892c06642735bcded59e5.zip kernel_samsung_smdk4412-26efa0bac9dc3587ee8892c06642735bcded59e5.tar.gz kernel_samsung_smdk4412-26efa0bac9dc3587ee8892c06642735bcded59e5.tar.bz2 | |
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/cifs_spnego.c')
| -rw-r--r-- | fs/cifs/cifs_spnego.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c index c53587b..379bd7d 100644 --- a/fs/cifs/cifs_spnego.c +++ b/fs/cifs/cifs_spnego.c @@ -133,9 +133,9 @@ cifs_get_spnego_key(struct cifsSesInfo *sesInfo) dp = description + strlen(description); /* for now, only sec=krb5 and sec=mskrb5 are valid */ - if (server->secType == Kerberos) + if (server->sec_kerberos) sprintf(dp, ";sec=krb5"); - else if (server->secType == MSKerberos) + else if (server->sec_mskerberos) sprintf(dp, ";sec=mskrb5"); else goto out; |