Commit 2705f791 authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard

msv1_0: Drop the ntlm_auth version check.

parent 07cb943d
...@@ -205,10 +205,6 @@ static NTSTATUS ntlm_fork( void *args ) ...@@ -205,10 +205,6 @@ static NTSTATUS ntlm_fork( void *args )
return SEC_E_OK; 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 ) static NTSTATUS ntlm_check_version( void *args )
{ {
struct ntlm_ctx ctx = { 0 }; struct ntlm_ctx ctx = { 0 };
...@@ -225,28 +221,16 @@ static NTSTATUS ntlm_check_version( void *args ) ...@@ -225,28 +221,16 @@ static NTSTATUS ntlm_check_version( void *args )
if ((len = read( ctx.pipe_in, buf, sizeof(buf) - 1 )) > 8) if ((len = read( ctx.pipe_in, buf, sizeof(buf) - 1 )) > 8)
{ {
char *newline; char *newline;
int major = 0, minor = 0, micro = 0;
if ((newline = memchr( buf, '\n', len ))) *newline = 0; if ((newline = memchr( buf, '\n', len ))) *newline = 0;
else buf[len] = 0; else buf[len] = 0;
if (sscanf( buf, "Version %d.%d.%d", &major, &minor, &micro ) == 3) TRACE( "detected ntlm_auth version %s\n", debugstr_a(buf) );
{ status = STATUS_SUCCESS;
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;
}
}
} }
if (status) ERR_(winediag)( "ntlm_auth was not found or is outdated. " if (status) ERR_(winediag)( "ntlm_auth was not found. Make sure that ntlm_auth >= 3.0.25 is in your path. "
"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" );
"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 );
ntlm_cleanup( &ctx ); ntlm_cleanup( &ctx );
return status; return status;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment