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 #11915 from akallabeth/rdp-parse

Browse Source 
[client,common] fix parsing of enablerdsaadauth
This commit is contained in:
akallabeth
2025-10-03 13:49:29 +02:00
committed by GitHub
parent 11bd807c5c 625376a937
commit 8ccdfb70b2
7 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/common/file.c
View File

@@ -1957,15 +1957,8 @@ BOOL freerdp_client_populate_settings_from_rdp_file_unchecked(const rdpFile* fil
if (~file->EnableRdsAadAuth)
{
if (!freerdp_settings_set_bool(settings, FreeRDP_AadSecurity, file->EnableRdsAadAuth != 0))
return FALSE;
if (!freerdp_settings_set_bool(settings, FreeRDP_RdstlsSecurity, TRUE))
return FALSE;
if (!freerdp_settings_set_bool(settings, FreeRDP_RdpSecurity, FALSE))
return FALSE;
if (!freerdp_settings_set_bool(settings, FreeRDP_TlsSecurity, FALSE))
return FALSE;
if (!freerdp_settings_set_bool(settings, FreeRDP_NlaSecurity, FALSE))
const BOOL val = file->EnableRdsAadAuth != 0;
if (!freerdp_settings_set_bool(settings, FreeRDP_AadSecurity, val))
return FALSE;
}

8
client/common/test/rdp-testcases/test1.json
View File

@@ -57,9 +57,9 @@
"FreeRDP_RemdeskVirtualChannel": false,
"FreeRDP_LyncRdpMode": false,
"FreeRDP_RemoteAssistanceRequestControl": false,
"FreeRDP_TlsSecurity": false,
"FreeRDP_NlaSecurity": false,
"FreeRDP_RdpSecurity": false,
"FreeRDP_TlsSecurity": true,
"FreeRDP_NlaSecurity": true,
"FreeRDP_RdpSecurity": true,
"FreeRDP_ExtSecurity": false,
"FreeRDP_Authentication": true,
"FreeRDP_NegotiateSecurityLayer": true,
@@ -67,7 +67,7 @@
"FreeRDP_DisableCredentialsDelegation": false,
"FreeRDP_VmConnectMode": false,
"FreeRDP_FIPSMode": false,
"FreeRDP_RdstlsSecurity": true,
"FreeRDP_RdstlsSecurity": false,
"FreeRDP_AadSecurity": false,
"FreeRDP_RemoteCredentialGuard": false,
"FreeRDP_RestrictedAdminModeSupported": true,

8
client/common/test/rdp-testcases/test1.unchecked.json
View File

@@ -57,9 +57,9 @@
"FreeRDP_RemdeskVirtualChannel": false,
"FreeRDP_LyncRdpMode": false,
"FreeRDP_RemoteAssistanceRequestControl": false,
"FreeRDP_TlsSecurity": false,
"FreeRDP_NlaSecurity": false,
"FreeRDP_RdpSecurity": false,
"FreeRDP_TlsSecurity": true,
"FreeRDP_NlaSecurity": true,
"FreeRDP_RdpSecurity": true,
"FreeRDP_ExtSecurity": false,
"FreeRDP_Authentication": true,
"FreeRDP_NegotiateSecurityLayer": true,
@@ -67,7 +67,7 @@
"FreeRDP_DisableCredentialsDelegation": false,
"FreeRDP_VmConnectMode": false,
"FreeRDP_FIPSMode": false,
"FreeRDP_RdstlsSecurity": true,
"FreeRDP_RdstlsSecurity": false,
"FreeRDP_AadSecurity": false,
"FreeRDP_RemoteCredentialGuard": false,
"FreeRDP_RestrictedAdminModeSupported": true,

8
client/common/test/rdp-testcases/test2.json
View File

@@ -57,9 +57,9 @@
"FreeRDP_RemdeskVirtualChannel": false,
"FreeRDP_LyncRdpMode": false,
"FreeRDP_RemoteAssistanceRequestControl": false,
"FreeRDP_TlsSecurity": false,
"FreeRDP_NlaSecurity": false,
"FreeRDP_RdpSecurity": false,
"FreeRDP_TlsSecurity": true,
"FreeRDP_NlaSecurity": true,
"FreeRDP_RdpSecurity": true,
"FreeRDP_ExtSecurity": false,
"FreeRDP_Authentication": true,
"FreeRDP_NegotiateSecurityLayer": true,
@@ -67,7 +67,7 @@
"FreeRDP_DisableCredentialsDelegation": false,
"FreeRDP_VmConnectMode": false,
"FreeRDP_FIPSMode": false,
"FreeRDP_RdstlsSecurity": true,
"FreeRDP_RdstlsSecurity": false,
"FreeRDP_AadSecurity": false,
"FreeRDP_RemoteCredentialGuard": false,
"FreeRDP_RestrictedAdminModeSupported": true,

8
client/common/test/rdp-testcases/test2.unchecked.json
View File

@@ -57,9 +57,9 @@
"FreeRDP_RemdeskVirtualChannel": false,
"FreeRDP_LyncRdpMode": false,
"FreeRDP_RemoteAssistanceRequestControl": false,
"FreeRDP_TlsSecurity": false,
"FreeRDP_NlaSecurity": false,
"FreeRDP_RdpSecurity": false,
"FreeRDP_TlsSecurity": true,
"FreeRDP_NlaSecurity": true,
"FreeRDP_RdpSecurity": true,
"FreeRDP_ExtSecurity": false,
"FreeRDP_Authentication": true,
"FreeRDP_NegotiateSecurityLayer": true,
@@ -67,7 +67,7 @@
"FreeRDP_DisableCredentialsDelegation": false,
"FreeRDP_VmConnectMode": false,
"FreeRDP_FIPSMode": false,
"FreeRDP_RdstlsSecurity": true,
"FreeRDP_RdstlsSecurity": false,
"FreeRDP_AadSecurity": false,
"FreeRDP_RemoteCredentialGuard": false,
"FreeRDP_RestrictedAdminModeSupported": true,

8
client/common/test/rdp-testcases/test3.json
View File

@@ -57,9 +57,9 @@
"FreeRDP_RemdeskVirtualChannel": false,
"FreeRDP_LyncRdpMode": false,
"FreeRDP_RemoteAssistanceRequestControl": false,
"FreeRDP_TlsSecurity": false,
"FreeRDP_NlaSecurity": false,
"FreeRDP_RdpSecurity": false,
"FreeRDP_TlsSecurity": true,
"FreeRDP_NlaSecurity": true,
"FreeRDP_RdpSecurity": true,
"FreeRDP_ExtSecurity": false,
"FreeRDP_Authentication": true,
"FreeRDP_NegotiateSecurityLayer": true,
@@ -67,7 +67,7 @@
"FreeRDP_DisableCredentialsDelegation": false,
"FreeRDP_VmConnectMode": false,
"FreeRDP_FIPSMode": false,
"FreeRDP_RdstlsSecurity": true,
"FreeRDP_RdstlsSecurity": false,
"FreeRDP_AadSecurity": false,
"FreeRDP_RemoteCredentialGuard": false,
"FreeRDP_RestrictedAdminModeSupported": true,

8
client/common/test/rdp-testcases/test3.unchecked.json
View File

@@ -57,9 +57,9 @@
"FreeRDP_RemdeskVirtualChannel": false,
"FreeRDP_LyncRdpMode": false,
"FreeRDP_RemoteAssistanceRequestControl": false,
"FreeRDP_TlsSecurity": false,
"FreeRDP_NlaSecurity": false,
"FreeRDP_RdpSecurity": false,
"FreeRDP_TlsSecurity": true,
"FreeRDP_NlaSecurity": true,
"FreeRDP_RdpSecurity": true,
"FreeRDP_ExtSecurity": false,
"FreeRDP_Authentication": true,
"FreeRDP_NegotiateSecurityLayer": true,
@@ -67,7 +67,7 @@
"FreeRDP_DisableCredentialsDelegation": false,
"FreeRDP_VmConnectMode": false,
"FreeRDP_FIPSMode": false,
"FreeRDP_RdstlsSecurity": true,
"FreeRDP_RdstlsSecurity": false,
"FreeRDP_AadSecurity": false,
"FreeRDP_RemoteCredentialGuard": false,
"FreeRDP_RestrictedAdminModeSupported": true,