[SCM] Samba Shared Repository - branch v3-5-test updated

Karolin Seeger kseeger at samba.org
Tue May 25 02:57:57 MDT 2010


The branch, v3-5-test has been updated
       via  70098b7... Fix what looks like a cut-and-paste error in our read_negTokenInit() function.
      from  920ffe4... Fix bug #7410 - samba sends "raw" inode number as uniqueid with unix extensions.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit 70098b751c10e632738f687976e6ef5e5fb2fc7b
Author: Jeremy Allison <jra at samba.org>
Date:   Thu May 20 14:30:44 2010 -0700

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

-----------------------------------------------------------------------

Summary of changes:
 libcli/auth/spnego_parse.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

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


-- 
Samba Shared Repository


More information about the samba-cvs mailing list