svn commit: samba r13405 - in branches/SAMBA_4_0/source/libcli/smb_composite: .

[abartlet at samba.org]

Author: abartlet
Date: 2006-02-09 03:06:02 +0000 (Thu, 09 Feb 2006)
New Revision: 13405

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13405

Log:
Allow a fallback if SPNEGO is somehow disabled in the client, to just NTLMSSP.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/libcli/smb_composite/sesssetup.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/smb_composite/sesssetup.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/smb_composite/sesssetup.c	2006-02-09 03:05:22 UTC (rev 13404)
+++ branches/SAMBA_4_0/source/libcli/smb_composite/sesssetup.c	2006-02-09 03:06:02 UTC (rev 13405)
@@ -326,7 +326,13 @@
 	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,