From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 19 Nov 2015 15:02:58 +0000 (+0100)
Subject: CVE-2016-2110(<=4.2): auth/ntlmssp: implement new_spnego support including MIC checki... 
X-Git-Tag: samba-4.2.10~191
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65bd884149a68c01336c5af462b1e5b2ec66b3d5;p=thirdparty%2Fsamba.git

CVE-2016-2110(<=4.2): auth/ntlmssp: implement new_spnego support including MIC checking (as server)

This fixes the build in 4.2 and older versions.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11644

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Günther Deschner <gd@samba.org>
---

diff --git a/auth/ntlmssp/ntlmssp_server.c b/auth/ntlmssp/ntlmssp_server.c
index 17d5adeaeb5..954964196d1 100644
--- a/auth/ntlmssp/ntlmssp_server.c
+++ b/auth/ntlmssp/ntlmssp_server.c
@@ -608,10 +608,8 @@ static NTSTATUS ntlmssp_server_preauth(struct gensec_security *gensec_security,
 						 "user=[%s] domain=[%s] "
 						 "workstation=[%s]\n",
 						 __func__,
-						 timeval_str_buf(&ct, false,
-								 true, &tmp1),
-						 timeval_str_buf(&st, false,
-								 true, &tmp2),
+						 timeval_str_buf(&ct, true, &tmp1),
+						 timeval_str_buf(&st, true, &tmp2),
 						 ntlmssp_state->user,
 						 ntlmssp_state->domain,
 						 ntlmssp_state->client.netbios_name));
@@ -635,7 +633,7 @@ static NTSTATUS ntlmssp_server_preauth(struct gensec_security *gensec_security,
 		DEBUG(1,("%s: challenge invalid (expired %s) for "
 			 "user=[%s] domain=[%s] workstation=[%s]\n",
 			 __func__,
-			 timeval_str_buf(&endtime, false, true, &tmp),
+			 timeval_str_buf(&endtime, true, &tmp),
 			 ntlmssp_state->user, ntlmssp_state->domain,
 			 ntlmssp_state->client.netbios_name));
 		return NT_STATUS_INVALID_PARAMETER;