diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-10 07:27:33 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-10 07:27:33 +0200 |
| commit | e548833df83c3554229eff0672900bfe958b45fd (patch) | |
| tree | 85efc4a76dc356593d6d394776aeb845dc580fb6 /fs/cifs/asn1.c | |
| parent | drivers/net/bnx2x: use ARRAY_SIZE macro in bnx2x_main.c (diff) | |
| parent | Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst... (diff) | |
| download | linux-e548833df83c3554229eff0672900bfe958b45fd.tar.xz linux-e548833df83c3554229eff0672900bfe958b45fd.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/main.c
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 cfd1ce34e0bc..21f0fbd86989 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; - else if (compare_oid(oid, oidlen, KRB5U2U_OID, + if (compare_oid(oid, oidlen, KRB5U2U_OID, KRB5U2U_OID_LEN)) server->sec_kerberosu2u = true; - else if (compare_oid(oid, oidlen, KRB5_OID, + if (compare_oid(oid, oidlen, KRB5_OID, KRB5_OID_LEN)) server->sec_kerberos = true; - else if (compare_oid(oid, oidlen, NTLMSSP_OID, + if (compare_oid(oid, oidlen, NTLMSSP_OID, NTLMSSP_OID_LEN)) server->sec_ntlmssp = true; |