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

Fixed missing packageName setup in server NLA

Browse Source
This commit is contained in:
Armin Novak 2018-01-17 09:09:58 +01:00
parent 0e1a073384
commit 29f2d2d9bb
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libfreerdp/core/nla.c
View File

@ -690,6 +690,7 @@ static int nla_server_init(rdpNla* nla)
}
nla->cbMaxToken = nla->pPackageInfo->cbMaxToken;
nla->packageName = nla->pPackageInfo->Name;
nla->status = nla->table->AcquireCredentialsHandle(NULL, NLA_PKG_NAME,
SECPKG_CRED_INBOUND, NULL, NULL, NULL, NULL, &nla->credentials, &nla->expiration);

8
winpr/libwinpr/sspi/Negotiate/negotiate.c
View File

@ -74,7 +74,7 @@ const SecPkgInfoW NEGOTIATE_SecPkgInfoW =
static void negotiate_SetSubPackage(NEGOTIATE_CONTEXT* context, const char* name)
{
if (strcmp(name, KERBEROS_SSP_NAME) == 0)
if (strncmp(name, KERBEROS_SSP_NAME, sizeof(KERBEROS_SSP_NAME)) == 0)
{
context->sspiA = (SecurityFunctionTableA*) &KERBEROS_SecurityFunctionTableA;
context->sspiW = (SecurityFunctionTableW*) &KERBEROS_SecurityFunctionTableW;
@ -99,7 +99,7 @@ static NEGOTIATE_CONTEXT* negotiate_ContextNew(void)
context->NegotiateFlags = 0;
context->state = NEGOTIATE_STATE_INITIAL;
SecInvalidateHandle(&(context->SubContext));
negotiate_SetSubPackage(context, (const char*) KERBEROS_SSP_NAME);
negotiate_SetSubPackage(context, KERBEROS_SSP_NAME);
return context;
}
@ -134,7 +134,7 @@ static SECURITY_STATUS SEC_ENTRY negotiate_InitializeSecurityContextW(PCredHandl
{
if (!pInput)
{
negotiate_SetSubPackage(context, (const char*) KERBEROS_SSP_NAME);
negotiate_SetSubPackage(context, KERBEROS_SSP_NAME);
}
status = context->sspiW->InitializeSecurityContextW(phCredential, &(context->SubContext),
@ -192,7 +192,7 @@ static SECURITY_STATUS SEC_ENTRY negotiate_InitializeSecurityContextA(PCredHandl
{
if (!pInput)
{
negotiate_SetSubPackage(context, (const char*) KERBEROS_SSP_NAME);
negotiate_SetSubPackage(context, KERBEROS_SSP_NAME);
}
status = context->sspiA->InitializeSecurityContextA(phCredential, &(context->SubContext),