Skip to content

W
wine-cw
Commit f8dea2d8 authored by Mike McCormack's avatar Mike McCormack Committed by Alexandre Julliard
Browse files
Options

secur32: Avoid some code duplication.

parent a534fdec
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 45 deletions
dlls/secur32/ntlm.c
View file @ f8dea2d8
...@@ -129,69 +129,45 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( ...@@ -129,69 +129,45 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW(
LPWKSTA_USER_INFO_1 ui = NULL; LPWKSTA_USER_INFO_1 ui = NULL;
NET_API_STATUS status; NET_API_STATUS status;
if((status = NetWkstaUserGetInfo(NULL, 1, (LPBYTE *)&ui)) != status = NetWkstaUserGetInfo(NULL, 1, (LPBYTE *)&ui);
NERR_Success) if (status != NERR_Success || ui == NULL)
{ {
ret = SEC_E_NO_CREDENTIALS; ret = SEC_E_NO_CREDENTIALS;
phCredential = NULL; phCredential = NULL;
break; break;
} }
if(ui != NULL) username = HeapAlloc(GetProcessHeap(), 0,
{ (lstrlenW(ui->wkui1_username)+1) *
username = HeapAlloc(GetProcessHeap(), 0, sizeof(SEC_WCHAR));
(lstrlenW(ui->wkui1_username)+1) * lstrcpyW(username, ui->wkui1_username);
sizeof(SEC_WCHAR));
lstrcpyW(username, ui->wkui1_username);
/* same for the domain */ /* same for the domain */
domain = HeapAlloc(GetProcessHeap(), 0, domain = HeapAlloc(GetProcessHeap(), 0,
(lstrlenW(ui->wkui1_logon_domain)+1) * (lstrlenW(ui->wkui1_logon_domain)+1) *
sizeof(SEC_WCHAR)); sizeof(SEC_WCHAR));
lstrcpyW(domain, ui->wkui1_logon_domain); lstrcpyW(domain, ui->wkui1_logon_domain);
NetApiBufferFree(ui); NetApiBufferFree(ui);
}
else
{
ret = SEC_E_NO_CREDENTIALS;
phCredential = NULL;
break;
}
} }
else else
{ {
PSEC_WINNT_AUTH_IDENTITY_W auth_data = PSEC_WINNT_AUTH_IDENTITY_W auth_data =
(PSEC_WINNT_AUTH_IDENTITY_W)pAuthData; (PSEC_WINNT_AUTH_IDENTITY_W)pAuthData;
if(auth_data->UserLength != 0) if (!auth_data->UserLength || !auth_data->DomainLength)
{
/* Get username and domain from pAuthData */
username = HeapAlloc(GetProcessHeap(), 0,
(auth_data->UserLength + 1) * sizeof(SEC_WCHAR));
lstrcpyW(username, auth_data->User);
}
else
{ {
ret = SEC_E_NO_CREDENTIALS; ret = SEC_E_NO_CREDENTIALS;
phCredential = NULL; phCredential = NULL;
break; break;
} }
if(auth_data->DomainLength != 0) /* Get username and domain from pAuthData */
{ username = HeapAlloc(GetProcessHeap(), 0,
domain = HeapAlloc(GetProcessHeap(), 0, (auth_data->UserLength + 1) * sizeof(SEC_WCHAR));
(auth_data->DomainLength + 1) * sizeof(SEC_WCHAR)); lstrcpyW(username, auth_data->User);
lstrcpyW(domain, auth_data->Domain);
domain = HeapAlloc(GetProcessHeap(), 0,
} (auth_data->DomainLength + 1) * sizeof(SEC_WCHAR));
else lstrcpyW(domain, auth_data->Domain);
{
ret = SEC_E_NO_CREDENTIALS;
phCredential = NULL;
break;
}
} }
TRACE("Username is %s\n", debugstr_w(username)); TRACE("Username is %s\n", debugstr_w(username));
unixcp_size = WideCharToMultiByte(CP_UNIXCP, WC_NO_BEST_FIT_CHARS, unixcp_size = WideCharToMultiByte(CP_UNIXCP, WC_NO_BEST_FIT_CHARS,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment