sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-11 16:58:40 +03:00
Code

spnego: fix server handling of no optimistic exchange

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14106

Signed-off-by: Isaac Boukris <iboukris@redhat.com>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Sat Oct 12 15:51:42 UTC 2019 on sn-devel-184
This commit is contained in:
Isaac Boukris 2019-09-04 17:04:12 +03:00 committed by Stefan Metzmacher
parent 68d91436d8
commit 8939186345
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
auth/gensec/spnego.c
View File

@ -1321,6 +1321,10 @@ static NTSTATUS gensec_spnego_server_negTokenInit_step(
spnego_state->mic_requested = true;
}
if (sub_in.length == 0) {
spnego_state->no_optimistic = true;
}
/*
* Note that 'cur_sec' is temporary memory, but
* cur_sec->oid points to a const string in the
@ -1955,6 +1959,15 @@ static void gensec_spnego_update_pre(struct tevent_req *req)
* Skip optimistic token per conf.
*/
state->sub.status = NT_STATUS_MORE_PROCESSING_REQUIRED;
} else if (spnego_state->state_position == SPNEGO_SERVER_START &&
state->sub.in.length == 0 && spnego_state->no_optimistic) {
/*
* If we didn't like the mechanism for which the client sent us
* an optimistic token, or if he didn't send any, don't call
* the sub mechanism just yet.
*/
state->sub.status = NT_STATUS_MORE_PROCESSING_REQUIRED;
spnego_state->no_optimistic = false;
} else {
/*
* MORE_PROCESSING_REQUIRED =>

2
selftest/knownfail.d/samba.tests.gensec
View File

@ -1,2 +0,0 @@
^samba.tests.gensec.samba.tests.gensec.GensecTests.test_update_no_optimistic_spnego
^samba.tests.gensec.samba.tests.gensec.GensecTests.test_update_spnego_downgrade

1
selftest/knownfail.d/spnego_downgrade
View File

@ -1 +0,0 @@
^samba3.blackbox.smbd_no_krb5.test_spnego_downgrade

1
selftest/knownfail.d/spnego_no_optimistic
View File

@ -1 +0,0 @@
^samba4.smb.spnego.*.no_optimistic