CVE-2016-2110(<=4.2): auth/ntlmssp: implement new_spnego support including MIC checki...

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 17d5adeaeb5419cf37ae998ec9b7db0ccf222db0..954964196d17c56798e0bd31a70d868bf59fd8b0 100644 (file)
--- 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;