svn commit: samba r3187 - in branches/SAMBA_4_0/source/libcli/auth: .

[abartlet at samba.org]

Author: abartlet
Date: 2004-10-25 04:21:41 +0000 (Mon, 25 Oct 2004)
New Revision: 3187

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source/libcli/auth&rev=3187&nolog=1

Log:
This 'optional' part of the ASN.1 in SPNEGO is required by Samba3 (but
not Microsoft).  Unfortunetly it's harder to fix Samba3 than to make
Samba4 cope...

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/libcli/auth/spnego_parse.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/auth/spnego_parse.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/auth/spnego_parse.c	2004-10-25 04:19:02 UTC (rev 3186)
+++ branches/SAMBA_4_0/source/libcli/auth/spnego_parse.c	2004-10-25 04:21:41 UTC (rev 3187)
@@ -233,11 +233,10 @@
 	asn1_push_tag(asn1, ASN1_CONTEXT(1));
 	asn1_push_tag(asn1, ASN1_SEQUENCE(0));
 
-	if (token->negResult != SPNEGO_NONE_RESULT) {
-		asn1_push_tag(asn1, ASN1_CONTEXT(0));
-		asn1_write_enumerated(asn1, token->negResult);
-		asn1_pop_tag(asn1);
-	}
+	/* Optional, except that Samba3 requires it... */
+	asn1_push_tag(asn1, ASN1_CONTEXT(0));
+	asn1_write_enumerated(asn1, token->negResult);
+	asn1_pop_tag(asn1);
 
 	if (token->supportedMech) {
 		asn1_push_tag(asn1, ASN1_CONTEXT(1));