summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2004-10-25 04:21:41 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:04:38 -0500
commitdb9b96d8e59b38b5900f4bcf1193c2110232137e (patch)
tree23a89919884de461eaeea2e9d41542e6d3f4add4
parente5fc6dd0bb460017f6678202afc1b73acb58af09 (diff)
downloadsamba-db9b96d8e59b38b5900f4bcf1193c2110232137e.tar.gz
samba-db9b96d8e59b38b5900f4bcf1193c2110232137e.tar.bz2
samba-db9b96d8e59b38b5900f4bcf1193c2110232137e.zip
r3187: 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 (This used to be commit bbd52ab2641d5d6fc184235ac838ce4a022174a9)
-rw-r--r--source4/libcli/auth/spnego_parse.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/source4/libcli/auth/spnego_parse.c b/source4/libcli/auth/spnego_parse.c
index 07dba61dde..4b94235962 100644
--- a/source4/libcli/auth/spnego_parse.c
+++ b/source4/libcli/auth/spnego_parse.c
@@ -233,11 +233,10 @@ static BOOL write_negTokenTarg(ASN1_DATA *asn1, struct spnego_negTokenTarg *toke
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));