mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libfreerdp-core: fix SPN for TS Gateway

Browse Source
This commit is contained in:
Marc-André Moreau 2012-11-27 16:37:56 -05:00
parent cf5d55d3cf
commit 2db4c27be7
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libfreerdp/core/ntlm.c
View File

@ -131,6 +131,12 @@ BOOL ntlm_client_make_spn(rdpNtlm* ntlm, LPCTSTR ServiceClass, char* hostname)
hostnameX = hostname;
#endif
if (!ServiceClass)
{
ntlm->ServicePrincipalName = (LPTSTR) _tcsdup(hostnameX);
return TRUE;
}
SpnLength = 0;
status = DsMakeSpn(ServiceClass, hostnameX, NULL, 0, NULL, &SpnLength, NULL);

16
libfreerdp/core/rpc.c
View File

@ -317,13 +317,17 @@ BOOL rpc_ntlm_http_out_connect(rdpRpc* rpc)
{
ntlm_client_init(ntlm, TRUE, settings->Username,
settings->Domain, settings->Password);
ntlm_client_make_spn(ntlm, _T("HTTP"), settings->GatewayHostname);
ntlm_client_make_spn(ntlm, NULL, settings->GatewayHostname);
//ntlm_client_make_spn(ntlm, _T("HTTP"), settings->GatewayHostname);
}
else
{
ntlm_client_init(ntlm, TRUE, settings->GatewayUsername,
settings->GatewayDomain, settings->GatewayPassword);
ntlm_client_make_spn(ntlm, _T("HTTP"), settings->GatewayHostname);
ntlm_client_make_spn(ntlm, NULL, settings->GatewayHostname);
//ntlm_client_make_spn(ntlm, _T("HTTP"), settings->GatewayHostname);
}
ntlm_authenticate(ntlm);
@ -380,13 +384,17 @@ BOOL rpc_ntlm_http_in_connect(rdpRpc* rpc)
{
ntlm_client_init(ntlm, TRUE, settings->Username,
settings->Domain, settings->Password);
ntlm_client_make_spn(ntlm, _T("HTTP"), settings->GatewayHostname);
ntlm_client_make_spn(ntlm, NULL, settings->GatewayHostname);
//ntlm_client_make_spn(ntlm, _T("HTTP"), settings->GatewayHostname);
}
else
{
ntlm_client_init(ntlm, TRUE, settings->GatewayUsername,
settings->GatewayDomain, settings->GatewayPassword);
ntlm_client_make_spn(ntlm, _T("HTTP"), settings->GatewayHostname);
ntlm_client_make_spn(ntlm, NULL, settings->GatewayHostname);
//ntlm_client_make_spn(ntlm, _T("HTTP"), settings->GatewayHostname);
}
ntlm_authenticate(ntlm);

3
winpr/libwinpr/sspi/NTLM/ntlm_message.c
View File

@ -937,6 +937,9 @@ SECURITY_STATUS ntlm_write_AuthenticateMessage(NTLM_CONTEXT* context, PSecBuffer
message.LmChallengeResponse.Len = (UINT16) context->LmChallengeResponse.cbBuffer;
message.LmChallengeResponse.Buffer = (BYTE*) context->LmChallengeResponse.pvBuffer;
if (context->NTLMv2)
ZeroMemory(message.LmChallengeResponse.Buffer, message.LmChallengeResponse.Len);
message.NtChallengeResponse.Len = (UINT16) context->NtChallengeResponse.cbBuffer;
message.NtChallengeResponse.Buffer = (BYTE*) context->NtChallengeResponse.pvBuffer;