diff options
| author | Stefan Metzmacher <metze@samba.org> | 2018-07-19 23:04:33 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2018-08-13 12:56:34 +0200 |
| commit | dcaa67ffa4d8e4dc311de683dc68922a2e343b08 (patch) | |
| tree | 278124f9d285740c4bc25374ae970414a002e501 /source4/libcli | |
| parent | 3212bc7694cf8f683f436f129289671122cbf92f (diff) | |
| download | samba-dcaa67ffa4d8e4dc311de683dc68922a2e343b08.tar.gz | |
s4:libcli: allow a fallback to NTLMSSP if SPNEGO is not supported locally
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
(cherry picked from commit 5188454bdce80f6e2bfc45deca18bd1b7289a7a6)
Diffstat (limited to 'source4/libcli')
| -rw-r--r-- | source4/libcli/smb2/session.c | 35 |
1 files changed, 30 insertions, 5 deletions
diff --git a/source4/libcli/smb2/session.c b/source4/libcli/smb2/session.c index e3e54cbe31a..a8985b2542c 100644 --- a/source4/libcli/smb2/session.c +++ b/source4/libcli/smb2/session.c @@ -196,13 +196,38 @@ struct tevent_req *smb2_session_setup_spnego_send( if (state->out_secblob.length > 0) { chosen_oid = GENSEC_OID_SPNEGO; + status = gensec_start_mech_by_oid(session->gensec, chosen_oid); + if (!NT_STATUS_IS_OK(status)) { + DEBUG(1, ("Failed to start set GENSEC client mechanism %s: %s\n", + gensec_get_name_by_oid(session->gensec, + chosen_oid), + nt_errstr(status))); + state->out_secblob = data_blob_null; + chosen_oid = GENSEC_OID_NTLMSSP; + status = gensec_start_mech_by_oid(session->gensec, + chosen_oid); + if (!NT_STATUS_IS_OK(status)) { + DEBUG(1, ("Failed to start set (fallback) GENSEC client mechanism %s: %s\n", + gensec_get_name_by_oid(session->gensec, + chosen_oid), + nt_errstr(status))); + } + } + if (tevent_req_nterror(req, status)) { + return tevent_req_post(req, ev); + } } else { chosen_oid = GENSEC_OID_NTLMSSP; - } - - status = gensec_start_mech_by_oid(session->gensec, chosen_oid); - if (tevent_req_nterror(req, status)) { - return tevent_req_post(req, ev); + status = gensec_start_mech_by_oid(session->gensec, chosen_oid); + if (!NT_STATUS_IS_OK(status)) { + DEBUG(1, ("Failed to start set GENSEC client mechanism %s: %s\n", + gensec_get_name_by_oid(session->gensec, + chosen_oid), + nt_errstr(status))); + } + if (tevent_req_nterror(req, status)) { + return tevent_req_post(req, ev); + } } smb2_session_setup_spnego_gensec_next(req); |