diff options
| author | Stefan Metzmacher <metze@samba.org> | 2004-10-27 12:59:41 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:04:50 -0500 |
| commit | bb26de6bbb7b104fcc996dae349a407c9d221592 (patch) | |
| tree | fb078982a74b59375875f5e8c328905e53df379f /source4/libcli | |
| parent | 074da7ccf72bba1868d3f9e4ce206acbd56c8074 (diff) | |
| download | samba-bb26de6bbb7b104fcc996dae349a407c9d221592.tar.gz samba-bb26de6bbb7b104fcc996dae349a407c9d221592.tar.bz2 samba-bb26de6bbb7b104fcc996dae349a407c9d221592.zip | |
r3289: Mr. L. and Mr. B.!
can we decide to not break WinXP clients:-)
metze
(This used to be commit 5eb0ff78d5e68f488a439545fdaec90c28ef877a)
Diffstat (limited to 'source4/libcli')
| -rw-r--r-- | source4/libcli/auth/spnego.c | 3 | ||||
| -rw-r--r-- | source4/libcli/auth/spnego_parse.c | 11 |
2 files changed, 6 insertions, 8 deletions
diff --git a/source4/libcli/auth/spnego.c b/source4/libcli/auth/spnego.c index dff9cb0c51..85d77992fa 100644 --- a/source4/libcli/auth/spnego.c +++ b/source4/libcli/auth/spnego.c @@ -376,8 +376,7 @@ static NTSTATUS gensec_spnego_server_negTokenTarg(struct gensec_security *gensec 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 { diff --git a/source4/libcli/auth/spnego_parse.c b/source4/libcli/auth/spnego_parse.c index 337ba7a339..07dba61dde 100644 --- a/source4/libcli/auth/spnego_parse.c +++ b/source4/libcli/auth/spnego_parse.c @@ -233,12 +233,11 @@ 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 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)); |