diff options
| author | Steve French <sfrench@us.ibm.com> | 2010-09-08 23:10:58 +0200 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-09-08 23:10:58 +0200 |
| commit | c8e56f1f4fb9f82f63e4ce6d73a14501d0432c76 (patch) | |
| tree | 6d0988317a6eaf4b454c73a1dd95f89184f5b1ed /fs/cifs/asn1.c | |
| parent | Revert "missing changes during ntlmv2/ntlmssp auth and sign" (diff) | |
| download | linux-c8e56f1f4fb9f82f63e4ce6d73a14501d0432c76.tar.xz linux-c8e56f1f4fb9f82f63e4ce6d73a14501d0432c76.zip | |
Revert "[CIFS] Fix ntlmv2 auth with ntlmssp"
This reverts commit 9fbc590860e75785bdaf8b83e48fabfe4d4f7d58.
The change to kernel crypto and fixes to ntlvm2 and ntlmssp
series, introduced a regression. Deferring this patch series
to 2.6.37 after Shirish fixes it.
Signed-off-by: Steve French <sfrench@us.ibm.com>
Acked-by: Jeff Layton <jlayton@redhat.com>
CC: Shirish Pargaonkar <shirishp@us.ibm.com>
Diffstat (limited to 'fs/cifs/asn1.c')
| -rw-r--r-- | fs/cifs/asn1.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/cifs/asn1.c b/fs/cifs/asn1.c index 21f0fbd86989..cfd1ce34e0bc 100644 --- a/fs/cifs/asn1.c +++ b/fs/cifs/asn1.c @@ -597,13 +597,13 @@ decode_negTokenInit(unsigned char *security_blob, int length, if (compare_oid(oid, oidlen, MSKRB5_OID, MSKRB5_OID_LEN)) server->sec_mskerberos = true; - if (compare_oid(oid, oidlen, KRB5U2U_OID, + else if (compare_oid(oid, oidlen, KRB5U2U_OID, KRB5U2U_OID_LEN)) server->sec_kerberosu2u = true; - if (compare_oid(oid, oidlen, KRB5_OID, + else if (compare_oid(oid, oidlen, KRB5_OID, KRB5_OID_LEN)) server->sec_kerberos = true; - if (compare_oid(oid, oidlen, NTLMSSP_OID, + else if (compare_oid(oid, oidlen, NTLMSSP_OID, NTLMSSP_OID_LEN)) server->sec_ntlmssp = true; |