secur32: Also recognize samba4 failure message if ntlm_auth could not connect to winbindd.

8df04798 · Dmitry Timoshkov · Alexandre Julliard · ab5db464 · 8df04798
Commit 8df04798 authored Apr 12, 2014 by Dmitry Timoshkov Committed by Alexandre Julliard Apr 14, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

ntlm.c dlls/secur32/ntlm.c +6 -4

No files found.
--- 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) &&
+                if( (buffer_len >= ntlm_pipe_err_v3_len &&
-                    (strncmp(buffer, "BH NT_STATUS_ACCESS_DENIED",
+                     strncmp(buffer, "BH NT_STATUS_ACCESS_DENIED", ntlm_pipe_err_v3_len) == 0) ||
-                             ntlm_pipe_err_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;