diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2010-01-29 19:50:15 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2010-01-29 19:50:15 +0000 |
| commit | cd5401de5997a4d0441fd9707d01634a9c088362 (patch) | |
| tree | f39e0346dff07d86272018bb2639b5f1c8076e1b | |
| parent | 0b189c1ef3d77cbda07d04f7ecef80dc104ce9a5 (diff) | |
| download | cygnal-cd5401de5997a4d0441fd9707d01634a9c088362.tar.gz cygnal-cd5401de5997a4d0441fd9707d01634a9c088362.tar.bz2 cygnal-cd5401de5997a4d0441fd9707d01634a9c088362.zip | |
* 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.
| -rw-r--r-- | winsup/lsaauth/ChangeLog | 8 | ||||
| -rw-r--r-- | winsup/lsaauth/cyglsa.c | 7 | ||||
| -rw-r--r-- | winsup/lsaauth/cyglsa64.dll | bin | 8704 -> 8704 bytes | |||
| -rw-r--r-- | winsup/lsaauth/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 <corinna@vinschen.de> + + * 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 <mailinglist@dazjorz.com> * 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 <corinna@vinschen.de> @@ -16,7 +16,7 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include <wchar.h> #include <windows.h> #include <wininet.h> -#include <lm.h> +#include <lmcons.h> #include <iptypes.h> #include <ntsecapi.h> #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 Binary files differindex ef5c7aabf..0af4de12f 100644 --- a/winsup/lsaauth/cyglsa64.dll +++ b/winsup/lsaauth/cyglsa64.dll 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
|