diff options
| author | Jeremy Allison <jra@samba.org> | 2010-05-20 14:30:44 -0700 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2010-06-18 08:33:26 +0200 |
| commit | 5f7fa425e04884fbd830004ef933aa6e119fb31d (patch) | |
| tree | 39e72f0ab2a5e23c243fa1ca7f66e587941f1cbc | |
| parent | a160aeddea2d9dedaa9e66ac30b4bf713c68192f (diff) | |
| download | samba-5f7fa425e04884fbd830004ef933aa6e119fb31d.tar.gz | |
Fix what looks like a cut-and-paste error in our read_negTokenInit() function.
We should never be calling asn1_push_XXX functions inside an asn1
reading function. Change asn1_push_tag() -> asn1_start_tag() and
asn1_pop_tag() -> asn1_end_tag(). This allows us to connect to a
NetApp filer at the Microsoft plugfest.
Andrew PLEASE CHECK !
Jeremy.
Fix bug #7449 (spnego data mis-parsed - returns incorrect mechListMIC string).
(cherry picked from commit 70098b751c10e632738f687976e6ef5e5fb2fc7b)
| -rw-r--r-- | libcli/auth/spnego_parse.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libcli/auth/spnego_parse.c b/libcli/auth/spnego_parse.c index 3f7047b0e0b..86b083d805c 100644 --- a/libcli/auth/spnego_parse.c +++ b/libcli/auth/spnego_parse.c @@ -88,11 +88,11 @@ static bool read_negTokenInit(struct asn1_data *asn1, TALLOC_CTX *mem_ctx, /* RFC 2478 says we have an Octet String here, but W2k sends something different... */ char *mechListMIC; - asn1_push_tag(asn1, ASN1_SEQUENCE(0)); - asn1_push_tag(asn1, ASN1_CONTEXT(0)); + asn1_start_tag(asn1, ASN1_SEQUENCE(0)); + asn1_start_tag(asn1, ASN1_CONTEXT(0)); asn1_read_GeneralString(asn1, mem_ctx, &mechListMIC); - asn1_pop_tag(asn1); - asn1_pop_tag(asn1); + asn1_end_tag(asn1); + asn1_end_tag(asn1); token->targetPrincipal = mechListMIC; } |