summaryrefslogtreecommitdiff
path: root/source4/libcli/smb_composite
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2006-02-09 03:06:02 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:51:53 -0500
commitdebf1c9a926cf91cde577b9f4f31109899757a8e (patch)
tree7afb5ecef6c71ec86a13142774bd4576001aabd1 /source4/libcli/smb_composite
parent7546864a7866eda2ee07fd318c6fcfd5f1e84ad0 (diff)
downloadsamba-debf1c9a926cf91cde577b9f4f31109899757a8e.tar.gz
samba-debf1c9a926cf91cde577b9f4f31109899757a8e.tar.bz2
samba-debf1c9a926cf91cde577b9f4f31109899757a8e.zip
r13405: Allow a fallback if SPNEGO is somehow disabled in the client, to just NTLMSSP.
Andrew Bartlett (This used to be commit 3e96975d910496db87e8e34e310f0f6d283210bf)
Diffstat (limited to 'source4/libcli/smb_composite')
-rw-r--r--source4/libcli/smb_composite/sesssetup.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/source4/libcli/smb_composite/sesssetup.c b/source4/libcli/smb_composite/sesssetup.c
index bf027a0425..2edeb76503 100644
--- a/source4/libcli/smb_composite/sesssetup.c
+++ b/source4/libcli/smb_composite/sesssetup.c
@@ -326,7 +326,13 @@ static NTSTATUS session_setup_spnego(struct composite_context *c,
if (!NT_STATUS_IS_OK(status)) {
DEBUG(1, ("Failed to start set GENSEC client mechanism %s: %s\n",
gensec_get_name_by_oid(chosen_oid), nt_errstr(status)));
- return status;
+ 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(chosen_oid), nt_errstr(status)));
+ return status;
+ }
}
status = gensec_update(session->gensec, state,