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

[metze at samba.org]

Author: metze
Date: 2004-10-27 12:59:41 +0000 (Wed, 27 Oct 2004)
New Revision: 3289

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

Log:
Mr. L. and Mr. B.!

can we decide to not break WinXP clients:-)

metze

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


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/auth/spnego.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/auth/spnego.c	2004-10-27 08:36:51 UTC (rev 3288)
+++ branches/SAMBA_4_0/source/libcli/auth/spnego.c	2004-10-27 12:59:41 UTC (rev 3289)
@@ -376,8 +376,7 @@
 		spnego_out.negTokenTarg.negResult = SPNEGO_ACCEPT_INCOMPLETE;
 		spnego_state->state_position = SPNEGO_SERVER_TARG;
 	} else if (NT_STATUS_IS_OK(nt_status)) {
-		spnego_out.negTokenTarg.supportedMech 
-			= spnego_state->sub_sec_security->ops->oid;
+		spnego_out.negTokenTarg.supportedMech = NULL;
 		spnego_out.negTokenTarg.negResult = SPNEGO_ACCEPT_COMPLETED;
 		spnego_state->state_position = SPNEGO_DONE;
 	} else {

Modified: branches/SAMBA_4_0/source/libcli/auth/spnego_parse.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/auth/spnego_parse.c	2004-10-27 08:36:51 UTC (rev 3288)
+++ branches/SAMBA_4_0/source/libcli/auth/spnego_parse.c	2004-10-27 12:59:41 UTC (rev 3289)
@@ -233,12 +233,11 @@
 	asn1_push_tag(asn1, ASN1_CONTEXT(1));
 	asn1_push_tag(asn1, ASN1_SEQUENCE(0));
 
-#if 0
-	/* Optional, except that Samba3 requires it... */
-	asn1_push_tag(asn1, ASN1_CONTEXT(0));
-	asn1_write_enumerated(asn1, token->negResult);
-	asn1_pop_tag(asn1);
-#endif
+	if (token->negResult != SPNEGO_NONE_RESULT) {
+		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));