From: Armin Novak <armin.novak@thincast.com>
Date: Wed, 17 Jan 2018 08:09:58 +0000 (+0100)
Subject: Fixed missing packageName setup in server NLA
X-Git-Tag: 2.0.0-rc2~87^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=29f2d2d9bb75a8054ee2fce2d8fbbc81d29f7725;p=platform%2Fupstream%2Ffreerdp.git

Fixed missing packageName setup in server NLA
---

diff --git a/libfreerdp/core/nla.c b/libfreerdp/core/nla.c
index 8c87485..acf5b23 100644
--- a/libfreerdp/core/nla.c
+++ b/libfreerdp/core/nla.c
@@ -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);
 
diff --git a/winpr/libwinpr/sspi/Negotiate/negotiate.c b/winpr/libwinpr/sspi/Negotiate/negotiate.c
index 650ca7b..fa21112 100644
--- a/winpr/libwinpr/sspi/Negotiate/negotiate.c
+++ b/winpr/libwinpr/sspi/Negotiate/negotiate.c
@@ -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),