ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

secur32: Avoid some code duplication.

This commit is contained in:
Mike McCormack 2006-05-26 16:44:09 +09:00 committed by Alexandre Julliard
parent a534fdec32
commit f8dea2d803
1 changed files with 20 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
dlls/secur32/ntlm.c
View File

@ -129,16 +129,14 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW(
LPWKSTA_USER_INFO_1 ui = NULL;
NET_API_STATUS status;
if((status = NetWkstaUserGetInfo(NULL, 1, (LPBYTE *)&ui)) !=
NERR_Success)
status = NetWkstaUserGetInfo(NULL, 1, (LPBYTE *)&ui);
if (status != NERR_Success || ui == NULL)
{
ret = SEC_E_NO_CREDENTIALS;
phCredential = NULL;
break;
}
if(ui != NULL)
{
username = HeapAlloc(GetProcessHeap(), 0,
(lstrlenW(ui->wkui1_username)+1) *
sizeof(SEC_WCHAR));
@ -152,46 +150,24 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW(
NetApiBufferFree(ui);
}
else
{
PSEC_WINNT_AUTH_IDENTITY_W auth_data =
(PSEC_WINNT_AUTH_IDENTITY_W)pAuthData;
if (!auth_data->UserLength || !auth_data->DomainLength)
{
ret = SEC_E_NO_CREDENTIALS;
phCredential = NULL;
break;
}
}
else
{
PSEC_WINNT_AUTH_IDENTITY_W auth_data =
(PSEC_WINNT_AUTH_IDENTITY_W)pAuthData;
if(auth_data->UserLength != 0)
{
/* 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;
phCredential = NULL;
break;
}
if(auth_data->DomainLength != 0)
{
domain = HeapAlloc(GetProcessHeap(), 0,
(auth_data->DomainLength + 1) * sizeof(SEC_WCHAR));
lstrcpyW(domain, auth_data->Domain);
}
else
{
ret = SEC_E_NO_CREDENTIALS;
phCredential = NULL;
break;
}
}
TRACE("Username is %s\n", debugstr_w(username));
unixcp_size = WideCharToMultiByte(CP_UNIXCP, WC_NO_BEST_FIT_CHARS,