summaryrefslogtreecommitdiff
path: root/auth
diff options
context:
space:
mode:
authorIsaac Boukris <iboukris@gmail.com>2019-09-04 16:31:21 +0300
committerAndreas Schneider <asn@cryptomilk.org>2019-10-12 14:33:33 +0000
commitd7e57ef7dd7d583cffb7abbe42d71f4f33f2a9af (patch)
tree39939e7e89192637c6c69d6912d8c291173aa071 /auth
parent90f557f3a1ed0a49e88ab0db29999f1289486cfe (diff)
downloadsamba-d7e57ef7dd7d583cffb7abbe42d71f4f33f2a9af.tar.gz
spnego: add client option to omit sending an optimistic token
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>
Diffstat (limited to 'auth')
-rw-r--r--auth/gensec/spnego.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/auth/gensec/spnego.c b/auth/gensec/spnego.c
index c4b7efbed76..f706de30672 100644
--- a/auth/gensec/spnego.c
+++ b/auth/gensec/spnego.c
@@ -136,6 +136,7 @@ struct spnego_state {
bool done_mic_check;
bool simulate_w2k;
+ bool no_optimistic;
/*
* The following is used to implement
@@ -187,6 +188,10 @@ static NTSTATUS gensec_spnego_client_start(struct gensec_security *gensec_securi
spnego_state->simulate_w2k = gensec_setting_bool(gensec_security->settings,
"spnego", "simulate_w2k", false);
+ spnego_state->no_optimistic = gensec_setting_bool(gensec_security->settings,
+ "spnego",
+ "client_no_optimistic",
+ false);
gensec_security->private_data = spnego_state;
return NT_STATUS_OK;
@@ -1942,6 +1947,12 @@ static void gensec_spnego_update_pre(struct tevent_req *req)
* blob and NT_STATUS_OK.
*/
state->sub.status = NT_STATUS_OK;
+ } else if (spnego_state->state_position == SPNEGO_CLIENT_START &&
+ spnego_state->no_optimistic) {
+ /*
+ * Skip optimistic token per conf.
+ */
+ state->sub.status = NT_STATUS_MORE_PROCESSING_REQUIRED;
} else {
/*
* MORE_PROCESSING_REQUIRED =>