From: Jeremy Allison <jra@samba.org>
Date: Thu, 20 May 2010 21:30:44 +0000 (-0700)
Subject: Fix what looks like a cut-and-paste error in our read_negTokenInit() function.
X-Git-Tag: samba-3.6.0pre1~1797
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=2d46e07c47418fdec5239d65032277c7917a44a4;p=samba.git

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.
---

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;
 			}