github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up rdpSettings use in server

Browse Source
This commit is contained in:
akallabeth 2022-03-24 11:05:28 +01:00 committed by akallabeth
parent 1319c08bba
commit 770bc14d18
2 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/proxy/pf_client.c
View File

@ -757,9 +757,9 @@ static void pf_client_set_security_settings(pClientContext* pc)
config = pc->pdata->config; config = pc->pdata->config;
WINPR_ASSERT(config); WINPR_ASSERT(config);
settings->RdpSecurity = config->ClientRdpSecurity; freerdp_settings_set_bool(settings, FreeRDP_RdpSecurity, config->ClientRdpSecurity);
settings->TlsSecurity = config->ClientTlsSecurity; freerdp_settings_set_bool(settings, FreeRDP_TlsSecurity, config->ClientTlsSecurity);
settings->NlaSecurity = config->ClientNlaSecurity; freerdp_settings_set_bool(settings, FreeRDP_NlaSecurity, config->ClientNlaSecurity);
/* Smartcard authentication currently does not work with NLA */ /* Smartcard authentication currently does not work with NLA */
if (pf_client_use_proxy_smartcard_auth(settings)) if (pf_client_use_proxy_smartcard_auth(settings))

30
server/shadow/shadow_client.c
View File

@ -604,6 +604,7 @@ static BOOL shadow_client_activate(freerdp_peer* peer)
static BOOL shadow_client_logon(freerdp_peer* peer, const SEC_WINNT_AUTH_IDENTITY* identity, static BOOL shadow_client_logon(freerdp_peer* peer, const SEC_WINNT_AUTH_IDENTITY* identity,
BOOL automatic) BOOL automatic)
{ {
BOOL rc = FALSE;
char* user = NULL; char* user = NULL;
char* domain = NULL; char* domain = NULL;
char* password = NULL; char* password = NULL;
@ -662,38 +663,23 @@ static BOOL shadow_client_logon(freerdp_peer* peer, const SEC_WINNT_AUTH_IDENTIT
if ((identity->User && !user) || (identity->Domain && !domain) || if ((identity->User && !user) || (identity->Domain && !domain) ||
(identity->Password && !password)) (identity->Password && !password))
{ goto fail;
free(user);
free(domain);
free(password);
return FALSE;
}
if (user) if (user)
{ freerdp_settings_set_string(settings, FreeRDP_Username, user);
free(settings->Username);
settings->Username = user;
user = NULL;
}
if (domain) if (domain)
{ freerdp_settings_set_string(settings, FreeRDP_Domain, domain);
free(settings->Domain);
settings->Domain = domain;
domain = NULL;
}
if (password) if (password)
{ freerdp_settings_set_string(settings, FreeRDP_Password, password);
free(settings->Password);
settings->Password = password;
password = NULL;
}
rc = TRUE;
fail:
free(user); free(user);
free(domain); free(domain);
free(password); free(password);
return TRUE; return rc;
} }
static INLINE void shadow_client_common_frame_acknowledge(rdpShadowClient* client, UINT32 frameId) static INLINE void shadow_client_common_frame_acknowledge(rdpShadowClient* client, UINT32 frameId)