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

Fix remote credential guard channel loading

Browse Source 
This patch fixes the loading of the RCG channel. It also adds a guard so the
/remoteGuard cmdline doesn't work if the channel is not built in.
This commit is contained in:
David Fort
2025-12-01 12:10:24 +01:00
parent b971720115
commit 8df50f44b6
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/common/cmdline.c
View File

@@ -4860,6 +4860,7 @@ static int parse_command_line(rdpSettings* settings, const COMMAND_LINE_ARGUMENT
if (!freerdp_settings_set_bool(settings, FreeRDP_RestrictedAdminModeRequired, enable)) if (!freerdp_settings_set_bool(settings, FreeRDP_RestrictedAdminModeRequired, enable))
return fail_at(arg, COMMAND_LINE_ERROR); return fail_at(arg, COMMAND_LINE_ERROR);
} }
#ifndef CHANNEL_RDPEAR_CLIENT
CommandLineSwitchCase(arg, "remoteGuard") CommandLineSwitchCase(arg, "remoteGuard")
{ {
if (!freerdp_settings_set_bool(settings, FreeRDP_RemoteCredentialGuard, TRUE)) if (!freerdp_settings_set_bool(settings, FreeRDP_RemoteCredentialGuard, TRUE))
@@ -4867,6 +4868,7 @@ static int parse_command_line(rdpSettings* settings, const COMMAND_LINE_ARGUMENT
if (!freerdp_settings_set_bool(settings, FreeRDP_ExtSecurity, TRUE)) if (!freerdp_settings_set_bool(settings, FreeRDP_ExtSecurity, TRUE))
return fail_at(arg, COMMAND_LINE_ERROR); return fail_at(arg, COMMAND_LINE_ERROR);
} }
#endif
CommandLineSwitchCase(arg, "pth") CommandLineSwitchCase(arg, "pth")
{ {
if (!freerdp_settings_set_bool(settings, FreeRDP_ConsoleSession, TRUE)) if (!freerdp_settings_set_bool(settings, FreeRDP_ConsoleSession, TRUE))

2
client/common/cmdline.h
View File

@@ -404,8 +404,10 @@ static const COMMAND_LINE_ARGUMENT_A global_cmd_args[] = {
"connecting to a buggy server" }, "connecting to a buggy server" },
{ "restricted-admin", COMMAND_LINE_VALUE_FLAG, NULL, NULL, NULL, -1, "restrictedAdmin", { "restricted-admin", COMMAND_LINE_VALUE_FLAG, NULL, NULL, NULL, -1, "restrictedAdmin",
"Restricted admin mode" }, "Restricted admin mode" },
#ifndef CHANNEL_RDPEAR_CLIENT
{ "remoteGuard", COMMAND_LINE_VALUE_FLAG, NULL, NULL, NULL, -1, "remoteGuard", { "remoteGuard", COMMAND_LINE_VALUE_FLAG, NULL, NULL, NULL, -1, "remoteGuard",
"Remote guard credentials" }, "Remote guard credentials" },
#endif
{ "rfx", COMMAND_LINE_VALUE_FLAG, NULL, NULL, NULL, -1, NULL, "RemoteFX" }, { "rfx", COMMAND_LINE_VALUE_FLAG, NULL, NULL, NULL, -1, NULL, "RemoteFX" },
{ "rfx-mode", COMMAND_LINE_VALUE_REQUIRED, "[image|video]", NULL, NULL, -1, NULL, { "rfx-mode", COMMAND_LINE_VALUE_REQUIRED, "[image|video]", NULL, NULL, -1, NULL,
"RemoteFX mode" }, "RemoteFX mode" },

4
include/config/config.h.in
View File

@@ -89,6 +89,7 @@
#cmakedefine CHANNEL_DRIVE #cmakedefine CHANNEL_DRIVE
#cmakedefine CHANNEL_DRIVE_CLIENT #cmakedefine CHANNEL_DRIVE_CLIENT
#cmakedefine CHANNEL_DRIVE_SERVER #cmakedefine CHANNEL_DRIVE_SERVER
#cmakedefine CHANNEL_ECHO #cmakedefine CHANNEL_ECHO
#cmakedefine CHANNEL_ECHO_CLIENT #cmakedefine CHANNEL_ECHO_CLIENT
#cmakedefine CHANNEL_ECHO_SERVER #cmakedefine CHANNEL_ECHO_SERVER
@@ -134,6 +135,9 @@
#cmakedefine CHANNEL_RDPECAM #cmakedefine CHANNEL_RDPECAM
#cmakedefine CHANNEL_RDPECAM_CLIENT #cmakedefine CHANNEL_RDPECAM_CLIENT
#cmakedefine CHANNEL_RDPECAM_SERVER #cmakedefine CHANNEL_RDPECAM_SERVER
#cmakedefine CHANNEL_RDPEAR
#cmakedefine CHANNEL_RDPEAR_CLIENT
#cmakedefine CHANNEL_RDPEAR_SERVER
#cmakedefine CHANNEL_RDPEI #cmakedefine CHANNEL_RDPEI
#cmakedefine CHANNEL_RDPEI_CLIENT #cmakedefine CHANNEL_RDPEI_CLIENT
#cmakedefine CHANNEL_RDPEI_SERVER #cmakedefine CHANNEL_RDPEI_SERVER