From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 20 May 2009 15:17:07 +0000 (+0200)
Subject: s4:libcli/smb2: use raw ntlmssp if the server didn't provide a sec blob
X-Git-Tag: tdb-1.1.5~451
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=540b7130750f82d52a514a5117237e1b3e90e97b;p=thirdparty%2Fsamba.git

s4:libcli/smb2: use raw ntlmssp if the server didn't provide a sec blob

metze
---

diff --git a/source4/libcli/smb2/session.c b/source4/libcli/smb2/session.c
index 127bb9bcae7..cf50ba68318 100644
--- a/source4/libcli/smb2/session.c
+++ b/source4/libcli/smb2/session.c
@@ -207,6 +207,7 @@ struct composite_context *smb2_session_setup_spnego_send(struct smb2_session *se
 {
 	struct composite_context *c;
 	struct smb2_session_state *state;
+	const char *chosen_oid;
 
 	c = composite_create(session, session->transport->socket->event.ctx);
 	if (c == NULL) return NULL;
@@ -235,7 +236,13 @@ struct composite_context *smb2_session_setup_spnego_send(struct smb2_session *se
 	c->status = gensec_set_target_service(session->gensec, "cifs");
 	if (!composite_is_ok(c)) return c;
 
-	c->status = gensec_start_mech_by_oid(session->gensec, GENSEC_OID_SPNEGO);
+	if (session->transport->negotiate.secblob.length > 0) {
+		chosen_oid = GENSEC_OID_SPNEGO;
+	} else {
+		chosen_oid = GENSEC_OID_NTLMSSP;
+	}
+
+	c->status = gensec_start_mech_by_oid(session->gensec, chosen_oid);
 	if (!composite_is_ok(c)) return c;
 
 	c->status = gensec_update(session->gensec, c,