reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-01-31 17:23:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

secur32: Eliminate broken clean-up "cheat".

Browse Source
This commit is contained in:
Ken Thomases 2011-11-29 19:16:32 -06:00 committed by Alexandre Julliard
parent f4ac641af5
commit d977044e76
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/secur32/ntlm.c
View File

@ -2030,21 +2030,17 @@ void SECUR32_initNTLMSP(void)
NULL }; NULL };
if(fork_helper(&helper, ntlm_auth, args) != SEC_E_OK) if(fork_helper(&helper, ntlm_auth, args) != SEC_E_OK)
{ helper = NULL;
/* Cheat and allocate a helper anyway, so cleanup later will work. */
helper = HeapAlloc(GetProcessHeap(),0, sizeof(NegoHelper));
helper->major = helper->minor = helper->micro = -1;
helper->pipe_in = helper->pipe_out = -1;
}
else else
check_version(helper); check_version(helper);
if( (helper->major > MIN_NTLM_AUTH_MAJOR_VERSION) || if( helper &&
(helper->major == MIN_NTLM_AUTH_MAJOR_VERSION && ((helper->major > MIN_NTLM_AUTH_MAJOR_VERSION) ||
helper->minor > MIN_NTLM_AUTH_MINOR_VERSION) || (helper->major == MIN_NTLM_AUTH_MAJOR_VERSION &&
(helper->major == MIN_NTLM_AUTH_MAJOR_VERSION && helper->minor > MIN_NTLM_AUTH_MINOR_VERSION) ||
helper->minor == MIN_NTLM_AUTH_MINOR_VERSION && (helper->major == MIN_NTLM_AUTH_MAJOR_VERSION &&
helper->micro >= MIN_NTLM_AUTH_MICRO_VERSION) ) helper->minor == MIN_NTLM_AUTH_MINOR_VERSION &&
helper->micro >= MIN_NTLM_AUTH_MICRO_VERSION)) )
{ {
SecureProvider *provider = SECUR32_addProvider(&ntlmTableA, &ntlmTableW, NULL); SecureProvider *provider = SECUR32_addProvider(&ntlmTableA, &ntlmTableW, NULL);
SecureProvider *nego_provider = SECUR32_addProvider(&ntlmTableA, &ntlmTableW, NULL); SecureProvider *nego_provider = SECUR32_addProvider(&ntlmTableA, &ntlmTableW, NULL);