From 2705f791270b4cd710ed3be121837c18f02d70a7 Mon Sep 17 00:00:00 2001 From: Hans Leidekker Date: Wed, 16 Nov 2022 14:07:55 +0100 Subject: [PATCH] msv1_0: Drop the ntlm_auth version check. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53932 --- dlls/msv1_0/unixlib.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/dlls/msv1_0/unixlib.c b/dlls/msv1_0/unixlib.c index 799577fd4a5..779250fc650 100644 --- a/dlls/msv1_0/unixlib.c +++ b/dlls/msv1_0/unixlib.c @@ -205,10 +205,6 @@ static NTSTATUS ntlm_fork( void *args ) return SEC_E_OK; } -#define NTLM_AUTH_MAJOR_VERSION 3 -#define NTLM_AUTH_MINOR_VERSION 0 -#define NTLM_AUTH_MICRO_VERSION 25 - static NTSTATUS ntlm_check_version( void *args ) { struct ntlm_ctx ctx = { 0 }; @@ -225,28 +221,16 @@ static NTSTATUS ntlm_check_version( void *args ) if ((len = read( ctx.pipe_in, buf, sizeof(buf) - 1 )) > 8) { char *newline; - int major = 0, minor = 0, micro = 0; if ((newline = memchr( buf, '\n', len ))) *newline = 0; else buf[len] = 0; - if (sscanf( buf, "Version %d.%d.%d", &major, &minor, µ ) == 3) - { - if (((major > NTLM_AUTH_MAJOR_VERSION) || - (major == NTLM_AUTH_MAJOR_VERSION && minor > NTLM_AUTH_MINOR_VERSION) || - (major == NTLM_AUTH_MAJOR_VERSION && minor == NTLM_AUTH_MINOR_VERSION && - micro >= NTLM_AUTH_MICRO_VERSION))) - { - TRACE( "detected ntlm_auth version %d.%d.%d\n", major, minor, micro ); - status = STATUS_SUCCESS; - } - } + TRACE( "detected ntlm_auth version %s\n", debugstr_a(buf) ); + status = STATUS_SUCCESS; } - if (status) ERR_(winediag)( "ntlm_auth was not found or is outdated. " - "Make sure that ntlm_auth >= %d.%d.%d is in your path. " - "Usually, you can find it in the winbind package of your distribution.\n", - NTLM_AUTH_MAJOR_VERSION, NTLM_AUTH_MINOR_VERSION, NTLM_AUTH_MICRO_VERSION ); + if (status) ERR_(winediag)( "ntlm_auth was not found. Make sure that ntlm_auth >= 3.0.25 is in your path. " + "Usually, you can find it in the winbind package of your distribution.\n" ); ntlm_cleanup( &ctx ); return status; }