From 2eda0aa2ea7c3ff3c5c9f7cfa8cf65146be9564f Mon Sep 17 00:00:00 2001 From: akallabeth Date: Fri, 3 Feb 2023 11:13:04 +0100 Subject: [PATCH] [core,settings] remove unused setting --- client/common/client.c | 3 --- include/freerdp/settings.h | 4 +--- libfreerdp/common/settings_getters.c | 7 ------- libfreerdp/common/settings_str.c | 1 - libfreerdp/core/test/settings_property_lists.h | 1 - 5 files changed, 1 insertion(+), 15 deletions(-) diff --git a/client/common/client.c b/client/common/client.c index ad024b187..a19205ec3 100644 --- a/client/common/client.c +++ b/client/common/client.c @@ -876,9 +876,6 @@ BOOL client_cli_present_gateway_message(freerdp* instance, UINT32 type, BOOL isD } #endif - if (freerdp_settings_get_bool(instance->context->settings, FreeRDP_GatewayAutoConsent)) - return TRUE; - while (isConsentMandatory) { printf("I understand and agree to the terms of this policy (Y/N) \n"); diff --git a/include/freerdp/settings.h b/include/freerdp/settings.h index 71a976fbd..65f3e8c48 100644 --- a/include/freerdp/settings.h +++ b/include/freerdp/settings.h @@ -789,7 +789,6 @@ typedef struct #define FreeRDP_GatewayAcceptedCertLength (1999) #define FreeRDP_GatewayHttpUseWebsockets (2000) #define FreeRDP_GatewayHttpExtAuthSspiNtlm (2001) -#define FreeRDP_GatewayAutoConsent (2002) #define FreeRDP_ProxyType (2015) #define FreeRDP_ProxyHostname (2016) #define FreeRDP_ProxyPort (2017) @@ -1365,8 +1364,7 @@ struct rdp_settings ALIGN64 UINT32 GatewayAcceptedCertLength; /* 1999 */ ALIGN64 BOOL GatewayHttpUseWebsockets; /* 2000 */ ALIGN64 BOOL GatewayHttpExtAuthSspiNtlm; /* 2001 */ - ALIGN64 BOOL GatewayAutoConsent; /* 2002 */ - UINT64 padding2015[2015 - 2003]; /* 2003 */ + UINT64 padding2015[2015 - 2002]; /* 2002 */ /* Proxy */ ALIGN64 UINT32 ProxyType; /* 2015 */ diff --git a/libfreerdp/common/settings_getters.c b/libfreerdp/common/settings_getters.c index f80c9c290..58e56ba40 100644 --- a/libfreerdp/common/settings_getters.c +++ b/libfreerdp/common/settings_getters.c @@ -231,9 +231,6 @@ BOOL freerdp_settings_get_bool(const rdpSettings* settings, size_t id) case FreeRDP_Fullscreen: return settings->Fullscreen; - case FreeRDP_GatewayAutoConsent: - return settings->GatewayAutoConsent; - case FreeRDP_GatewayBypassLocal: return settings->GatewayBypassLocal; @@ -849,10 +846,6 @@ BOOL freerdp_settings_set_bool(rdpSettings* settings, size_t id, BOOL val) settings->Fullscreen = cnv.c; break; - case FreeRDP_GatewayAutoConsent: - settings->GatewayAutoConsent = cnv.c; - break; - case FreeRDP_GatewayBypassLocal: settings->GatewayBypassLocal = cnv.c; break; diff --git a/libfreerdp/common/settings_str.c b/libfreerdp/common/settings_str.c index ad36655ab..2d41c41c7 100644 --- a/libfreerdp/common/settings_str.c +++ b/libfreerdp/common/settings_str.c @@ -103,7 +103,6 @@ static const struct settings_str_entry settings_map[] = { { FreeRDP_FrameMarkerCommandEnabled, FREERDP_SETTINGS_TYPE_BOOL, "FreeRDP_FrameMarkerCommandEnabled" }, { FreeRDP_Fullscreen, FREERDP_SETTINGS_TYPE_BOOL, "FreeRDP_Fullscreen" }, - { FreeRDP_GatewayAutoConsent, FREERDP_SETTINGS_TYPE_BOOL, "FreeRDP_GatewayAutoConsent" }, { FreeRDP_GatewayBypassLocal, FREERDP_SETTINGS_TYPE_BOOL, "FreeRDP_GatewayBypassLocal" }, { FreeRDP_GatewayEnabled, FREERDP_SETTINGS_TYPE_BOOL, "FreeRDP_GatewayEnabled" }, { FreeRDP_GatewayHttpExtAuthSspiNtlm, FREERDP_SETTINGS_TYPE_BOOL, diff --git a/libfreerdp/core/test/settings_property_lists.h b/libfreerdp/core/test/settings_property_lists.h index 9ac866504..056a1b4fe 100644 --- a/libfreerdp/core/test/settings_property_lists.h +++ b/libfreerdp/core/test/settings_property_lists.h @@ -61,7 +61,6 @@ static const size_t bool_list_indices[] = { FreeRDP_ForceMultimon, FreeRDP_FrameMarkerCommandEnabled, FreeRDP_Fullscreen, - FreeRDP_GatewayAutoConsent, FreeRDP_GatewayBypassLocal, FreeRDP_GatewayEnabled, FreeRDP_GatewayHttpExtAuthSspiNtlm,