From cd5401de5997a4d0441fd9707d01634a9c088362 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Fri, 29 Jan 2010 19:50:15 +0000 Subject: [PATCH] * cyglsa.c: Include lmcons.h instead of lm.h to make newer WinDDK happy. (LsaApLogonUserEx): Use CYG_LSA_MAGIC as checksum start value to decouple from Cygwin release. * make-64bit-version-with-visual-c.bat: Avoid compiler warning. * cyglsa64.dll: New build. --- winsup/lsaauth/ChangeLog | 8 ++++++++ winsup/lsaauth/cyglsa.c | 7 +++---- winsup/lsaauth/cyglsa64.dll | Bin 8704 -> 8704 bytes .../make-64bit-version-with-visual-c.bat | 3 ++- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/winsup/lsaauth/ChangeLog b/winsup/lsaauth/ChangeLog index 6ff5edd1f..dfc4a05f8 100644 --- a/winsup/lsaauth/ChangeLog +++ b/winsup/lsaauth/ChangeLog @@ -1,3 +1,11 @@ +2010-01-29 Corinna Vinschen + + * cyglsa.c: Include lmcons.h instead of lm.h to make newer WinDDK happy. + (LsaApLogonUserEx): Use CYG_LSA_MAGIC as checksum start value to + decouple from Cygwin release. + * make-64bit-version-with-visual-c.bat: Avoid compiler warning. + * cyglsa64.dll: New build. + 2009-02-23 Sjors Gielen * Makefile.in: Add DESTDIR functionality. diff --git a/winsup/lsaauth/cyglsa.c b/winsup/lsaauth/cyglsa.c index cc44657c3..4ebbd201b 100644 --- a/winsup/lsaauth/cyglsa.c +++ b/winsup/lsaauth/cyglsa.c @@ -1,6 +1,6 @@ /* cyglsa.c: LSA authentication module for Cygwin - Copyright 2006, 2008 Red Hat, Inc. + Copyright 2006, 2008, 2010 Red Hat, Inc. Written by Corinna Vinschen @@ -16,7 +16,7 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include #include #include -#include +#include #include #include #ifdef __MINGW32__ @@ -322,8 +322,7 @@ LsaApLogonUserEx (PLSA_CLIENT_REQUEST request, SECURITY_LOGON_TYPE logon_type, cyglsa_printf ("Invalid authentication parameter.\n"); return STATUS_INVALID_PARAMETER; } - checksum = CYGWIN_VERSION_MAGIC (CYGWIN_VERSION_DLL_MAJOR, - CYGWIN_VERSION_DLL_MINOR); + checksum = CYG_LSA_MAGIC; csp = (PDWORD) &authinf->username; csp_end = (PDWORD) ((PBYTE) authinf + auth_len); while (csp < csp_end) diff --git a/winsup/lsaauth/cyglsa64.dll b/winsup/lsaauth/cyglsa64.dll index ef5c7aabf33ba381c6726615836eedb7e27c4e3d..0af4de12fb0539e33749a279eb93dbcdd11974ff 100644 GIT binary patch delta 3471 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 diff --git a/winsup/lsaauth/make-64bit-version-with-visual-c.bat b/winsup/lsaauth/make-64bit-version-with-visual-c.bat index cd623038e..28ea642f7 100644 --- a/winsup/lsaauth/make-64bit-version-with-visual-c.bat +++ b/winsup/lsaauth/make-64bit-version-with-visual-c.bat @@ -25,5 +25,6 @@ rem the security checks and there's apparently no runtmchk.lib anymore. rem I leave the old statements in for reference. rem cl /Wp64 /c cyglsa.c rem link /nodefaultlib /dll /machine:x64 /entry:DllMain /out:cyglsa64.dll /def:mslsa.def cyglsa.obj runtmchk.lib advapi32.lib kernel32.lib ntdll.lib -cl /Wp64 /EHs-c- /GS- /GR- /GL- /c cyglsa.c +rem cl /Wp64 /EHs-c- /GS- /GR- /GL- /c cyglsa.c +cl /EHs-c- /GS- /GR- /GL- /c cyglsa.c link /nodefaultlib /dll /machine:x64 /entry:DllMain /out:cyglsa64.dll /def:mslsa.def cyglsa.obj advapi32.lib kernel32.lib ntdll.lib