From 8df047987012ff290a789911692a23d9a248dc56 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Sat, 12 Apr 2014 15:24:20 +0900 Subject: [PATCH] secur32: Also recognize samba4 failure message if ntlm_auth could not connect to winbindd. --- dlls/secur32/ntlm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index fdd88c0c635..5914fbcc675 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1226,11 +1226,13 @@ SECURITY_STATUS SEC_ENTRY ntlm_AcceptSecurityContext( } else { - size_t ntlm_pipe_err_len = strlen("BH NT_STATUS_ACCESS_DENIED"); + size_t ntlm_pipe_err_v3_len = strlen("BH NT_STATUS_ACCESS_DENIED"); + size_t ntlm_pipe_err_v4_len = strlen("BH NT_STATUS_UNSUCCESSFUL"); - if( (buffer_len >= ntlm_pipe_err_len) && - (strncmp(buffer, "BH NT_STATUS_ACCESS_DENIED", - ntlm_pipe_err_len) == 0)) + if( (buffer_len >= ntlm_pipe_err_v3_len && + strncmp(buffer, "BH NT_STATUS_ACCESS_DENIED", ntlm_pipe_err_v3_len) == 0) || + (buffer_len >= ntlm_pipe_err_v4_len && + strncmp(buffer, "BH NT_STATUS_UNSUCCESSFUL", ntlm_pipe_err_v4_len) == 0) ) { TRACE("Connection to winbindd failed\n"); ret = SEC_E_LOGON_DENIED;