diff --git a/[refs] b/[refs] index 24d96e98d355..50aa831e1959 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef571cadd516e7ffcdeac6bb8054e5908fcccfcf +refs/heads/master: e2d2867ff8700d7431c68c089ff5f5ed7f2d5b40 diff --git a/trunk/fs/cifs/asn1.c b/trunk/fs/cifs/asn1.c index 42765465701c..6bb440b257b0 100644 --- a/trunk/fs/cifs/asn1.c +++ b/trunk/fs/cifs/asn1.c @@ -494,7 +494,7 @@ decode_negTokenInit(unsigned char *security_blob, int length, /* remember to free obj->oid */ rc = asn1_header_decode(&ctx, &end, &cls, &con, &tag); if (rc) { - if ((tag == ASN1_OJI) && (cls == ASN1_PRI)) { + if ((tag == ASN1_OJI) && (con == ASN1_PRI)) { rc = asn1_oid_decode(&ctx, end, &oid, &oidlen); if (rc) { rc = compare_oid(oid, oidlen,