morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 00:14:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12145 from akallabeth/krb-cache-fix

Browse Source 
Krb cache fix
This commit is contained in:
akallabeth
2026-01-15 10:02:33 +01:00
committed by GitHub
parent 38514dfa58 c730a837fd
commit 8eb25353d0
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
channels/location/client/location_main.c
View File

@@ -417,7 +417,7 @@ static UINT location_send(LocationClientContext* context, LOCATION_PDUTYPE type,
RDPLOCATION_LOCATION3D_DELTA_PDU pdu = { .latitudeDelta = va_arg(ap, double),
.longitudeDelta = va_arg(ap, double),
.altitudeDelta = va_arg(ap, INT32),
pdu.speedDelta = NULL,
.speedDelta = NULL,
.headingDelta = NULL };
if ((count > 3) && (callback->clientVersion >= RDPLOCATION_PROTOCOL_VERSION_200))
{

9
winpr/libwinpr/sspi/Kerberos/kerberos.c
View File

@@ -397,7 +397,12 @@ static SECURITY_STATUS SEC_ENTRY kerberos_AcquireCredentialsHandleA(
goto cleanup;
}
else
{
if (krb_log_exec(krb5_cc_default, ctx, &ccache))
goto cleanup;
own_ccache = FALSE;
}
WINPR_ASSERT(ccache);
}
else if (fCredentialUse & SECPKG_CRED_OUTBOUND)
{
@@ -406,6 +411,7 @@ static SECURITY_STATUS SEC_ENTRY kerberos_AcquireCredentialsHandleA(
goto cleanup;
if (krb_log_exec(krb5_cc_get_principal, ctx, ccache, &principal))
goto cleanup;
WINPR_ASSERT(ccache);
own_ccache = FALSE;
}
else
@@ -420,6 +426,7 @@ static SECURITY_STATUS SEC_ENTRY kerberos_AcquireCredentialsHandleA(
if (krb_log_exec(krb5_cc_resolve, ctx, krb_settings->cache, &ccache))
goto cleanup;
}
WINPR_ASSERT(ccache);
}
if (krb_settings && krb_settings->keytab)
@@ -446,6 +453,8 @@ static SECURITY_STATUS SEC_ENTRY kerberos_AcquireCredentialsHandleA(
matchCreds.client = principal;
WINPR_ASSERT(principal);
WINPR_ASSERT(ctx);
WINPR_ASSERT(ccache);
if (krb_log_exec(build_krbtgt, ctx, principal, &matchCreds.server))
goto cleanup;