[reactos] 01/01: [MSV1_0] Export LsaApLogonUserEx2 instead of LsaApLogonUser and remove the outdated logon functions.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6748d72c9ffc4018139017...
commit 6748d72c9ffc401813901706c3c48d64fa1cffd5 Author: Eric Kohl eric.kohl@reactos.org AuthorDate: Mon Mar 4 10:20:10 2019 +0100 Commit: Eric Kohl eric.kohl@reactos.org CommitDate: Mon Mar 4 10:20:10 2019 +0100
[MSV1_0] Export LsaApLogonUserEx2 instead of LsaApLogonUser and remove the outdated logon functions. --- dll/win32/msv1_0/msv1_0.c | 106 +++++++++---------------------------------- dll/win32/msv1_0/msv1_0.spec | 4 +- 2 files changed, 23 insertions(+), 87 deletions(-)
diff --git a/dll/win32/msv1_0/msv1_0.c b/dll/win32/msv1_0/msv1_0.c index bdcdfc2f84..9ff2b92234 100644 --- a/dll/win32/msv1_0/msv1_0.c +++ b/dll/win32/msv1_0/msv1_0.c @@ -1012,19 +1012,22 @@ LsaApLogonTerminated(IN PLUID LogonId) */ NTSTATUS NTAPI -LsaApLogonUser(IN PLSA_CLIENT_REQUEST ClientRequest, - IN SECURITY_LOGON_TYPE LogonType, - IN PVOID AuthenticationInformation, - IN PVOID ClientAuthenticationBase, - IN ULONG AuthenticationInformationLength, - OUT PVOID *ProfileBuffer, - OUT PULONG ProfileBufferLength, - OUT PLUID LogonId, - OUT PNTSTATUS SubStatus, - OUT PLSA_TOKEN_INFORMATION_TYPE TokenInformationType, - OUT PVOID *TokenInformation, - OUT PLSA_UNICODE_STRING *AccountName, - OUT PLSA_UNICODE_STRING *AuthenticatingAuthority) +LsaApLogonUserEx2(IN PLSA_CLIENT_REQUEST ClientRequest, + IN SECURITY_LOGON_TYPE LogonType, + IN PVOID ProtocolSubmitBuffer, + IN PVOID ClientBufferBase, + IN ULONG SubmitBufferSize, + OUT PVOID *ProfileBuffer, + OUT PULONG ProfileBufferSize, + OUT PLUID LogonId, + OUT PNTSTATUS SubStatus, + OUT PLSA_TOKEN_INFORMATION_TYPE TokenInformationType, + OUT PVOID *TokenInformation, + OUT PUNICODE_STRING *AccountName, + OUT PUNICODE_STRING *AuthenticatingAuthority, + OUT PUNICODE_STRING *MachineName, + OUT PSECPKG_PRIMARY_CRED PrimaryCredentials, + OUT PSECPKG_SUPPLEMENTAL_CRED_ARRAY *SupplementalCredentials) { PMSV1_0_INTERACTIVE_LOGON LogonInfo;
@@ -1048,11 +1051,11 @@ LsaApLogonUser(IN PLSA_CLIENT_REQUEST ClientRequest, TRACE("LsaApLogonUser()\n");
TRACE("LogonType: %lu\n", LogonType); - TRACE("AuthenticationInformation: %p\n", AuthenticationInformation); - TRACE("AuthenticationInformationLength: %lu\n", AuthenticationInformationLength); + TRACE("ProtocolSubmitBuffer: %p\n", ProtocolSubmitBuffer); + TRACE("SubmitBufferSize: %lu\n", SubmitBufferSize);
*ProfileBuffer = NULL; - *ProfileBufferLength = 0; + *ProfileBufferSize = 0; *SubStatus = STATUS_SUCCESS; *AccountName = NULL; *AuthenticatingAuthority = NULL; @@ -1063,10 +1066,10 @@ LsaApLogonUser(IN PLSA_CLIENT_REQUEST ClientRequest, { ULONG_PTR PtrOffset;
- LogonInfo = (PMSV1_0_INTERACTIVE_LOGON)AuthenticationInformation; + LogonInfo = (PMSV1_0_INTERACTIVE_LOGON)ProtocolSubmitBuffer;
/* Fix-up pointers in the authentication info */ - PtrOffset = (ULONG_PTR)AuthenticationInformation - (ULONG_PTR)ClientAuthenticationBase; + PtrOffset = (ULONG_PTR)ProtocolSubmitBuffer - (ULONG_PTR)ClientBufferBase;
LogonInfo->LogonDomainName.Buffer = FIXUP_POINTER(LogonInfo->LogonDomainName.Buffer, PtrOffset); LogonInfo->UserName.Buffer = FIXUP_POINTER(LogonInfo->UserName.Buffer, PtrOffset); @@ -1319,7 +1322,7 @@ LsaApLogonUser(IN PLSA_CLIENT_REQUEST ClientRequest, UserInfo, &LogonServer, (PMSV1_0_INTERACTIVE_PROFILE*)ProfileBuffer, - ProfileBufferLength); + ProfileBufferSize); if (!NT_SUCCESS(Status)) { TRACE("BuildInteractiveProfileBuffer failed (Status %08lx)\n", Status); @@ -1429,69 +1432,4 @@ done: return Status; }
- -/* - * @unimplemented - */ -#if 0 -NTSTATUS -NTAPI -LsaApLogonUserEx(IN PLSA_CLIENT_REQUEST ClientRequest, - IN SECURITY_LOGON_TYPE LogonType, - IN PVOID AuthenticationInformation, - IN PVOID ClientAuthenticationBase, - IN ULONG AuthenticationInformationLength, - OUT PVOID *ProfileBuffer, - OUT PULONG ProfileBufferLength, - OUT PLUID LogonId, - OUT PNTSTATUS SubStatus, - OUT PLSA_TOKEN_INFORMATION_TYPE TokenInformationType, - OUT PVOID *TokenInformation, - OUT PUNICODE_STRING *AccountName, - OUT PUNICODE_STRING *AuthenticatingAuthority, - OUT PUNICODE_STRING *MachineName) -{ - TRACE("()\n"); - - TRACE("LogonType: %lu\n", LogonType); - TRACE("AuthenticationInformation: %p\n", AuthenticationInformation); - TRACE("AuthenticationInformationLength: %lu\n", AuthenticationInformationLength); - - return STATUS_NOT_IMPLEMENTED; -} - - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -LsaApLogonUserEx2(IN PLSA_CLIENT_REQUEST ClientRequest, - IN SECURITY_LOGON_TYPE LogonType, - IN PVOID ProtocolSubmitBuffer, - IN PVOID ClientBufferBase, - IN ULONG SubmitBufferSize, - OUT PVOID *ProfileBuffer, - OUT PULONG ProfileBufferSize, - OUT PLUID LogonId, - OUT PNTSTATUS SubStatus, - OUT PLSA_TOKEN_INFORMATION_TYPE TokenInformationType, - OUT PVOID *TokenInformation, - OUT PUNICODE_STRING *AccountName, - OUT PUNICODE_STRING *AuthenticatingAuthority, - OUT PUNICODE_STRING *MachineName, - OUT PSECPKG_PRIMARY_CRED PrimaryCredentials, - OUT PSECPKG_SUPPLEMENTAL_CRED_ARRAY *SupplementalCredentials) -{ - TRACE("()\n"); - - TRACE("LogonType: %lu\n", LogonType); - TRACE("ProtocolSubmitBuffer: %p\n", ProtocolSubmitBuffer); - TRACE("SubmitBufferSize: %lu\n", SubmitBufferSize); - - - return STATUS_NOT_IMPLEMENTED; -} -#endif - /* EOF */ diff --git a/dll/win32/msv1_0/msv1_0.spec b/dll/win32/msv1_0/msv1_0.spec index 954de3de6f..34fe25e6ca 100644 --- a/dll/win32/msv1_0/msv1_0.spec +++ b/dll/win32/msv1_0/msv1_0.spec @@ -3,9 +3,7 @@ @ stdcall LsaApCallPackageUntrusted(ptr ptr ptr long ptr ptr ptr) @ stdcall LsaApInitializePackage(long ptr ptr ptr ptr) @ stdcall LsaApLogonTerminated(ptr) -@ stdcall LsaApLogonUser(ptr long ptr ptr long ptr ptr ptr ptr ptr ptr ptr ptr) -#@ stdcall LsaApLogonUserEx(ptr long ptr ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) -#@ stdcall LsaApLogonUserEx2(ptr long ptr ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stdcall LsaApLogonUserEx2(ptr long ptr ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stub Msv1_0ExportSubAuthenticationRoutine @ stub Msv1_0SubAuthenticationPresent @ stub MsvGetLogonAttemptCount
-
Eric Kohl