Module: wine Branch: master Commit: dfb2b429a02ba289dc863373652b2ae0db65da4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfb2b429a02ba289dc86337365...
Author: Kai Blin kai.blin@gmail.com Date: Tue Aug 11 22:13:10 2009 +0200
secur32: Load Negotiate provider again.
---
dlls/secur32/secur32.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 8f599f0..4171778 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -557,13 +557,11 @@ static void SECUR32_initializeProviders(void) cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs"); /* First load built-in providers */ SECUR32_initSchannelSP(); - /* Do not load Negotiate yet. This breaks for some user on the wine-users - * mailing list as of 2006-09-12. Without Negotiate, applications should - * fall back to NTLM and that should work.*/ -#if 0 - SECUR32_initNegotiateSP(); -#endif SECUR32_initNTLMSP(); + /* Load the Negotiate provider last so apps stumble over the working NTLM + * provider first. Attempting to fix bug #16905 while keeping the + * application reported on wine-users on 2006-09-12 working. */ + SECUR32_initNegotiateSP(); /* Now load providers from registry */ apiRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, securityProvidersKeyW, 0, KEY_READ, &key);