Attachment 5729 Details for Bug 7449 – Fix from mater to apply to 3.5.x.

[patch] Fix from mater to apply to 3.5.x.

0001-Fix-what-looks-like-a-cut-and-paste-error-in-our-rea.patch (text/plain), 1.36 KB, created by Jeremy Allison on 2010-05-21 13:23:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2010-05-21 13:23:24 UTC

Size: 1.36 KB

patch

obsolete

>From 2d46e07c47418fdec5239d65032277c7917a44a4 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Thu, 20 May 2010 14:30:44 -0700
>Subject: [PATCH] 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.
>---
> 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 3f7047b..86b083d 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;
> 			}
>-- 
>1.7.0.1
>

Flags:

metze: review+

Actions: View

Attachments on bug 7449: 5729