mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[server,proxy] remove unused section from config

Browse Source 
Remote GFXSettings and Clipboard section as it was no longer used. This
is a non breaking change, existing entries will be ignored (just like up
until now) but the generated config now no longer contains it.
This commit is contained in:
akallabeth 2024-07-01 11:34:01 +02:00
parent b00b38abc2
commit 8f4d105f50
No known key found for this signature in database
GPG Key ID: A49454A3FC909FD5
2 changed files with 3 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/freerdp/server/proxy/proxy_config.h
View File

@ -81,11 +81,11 @@ extern "C"
size_t InterceptCount;
/* clipboard specific settings */
BOOL TextOnly;
UINT32 MaxTextLength;
WINPR_DEPRECATED_VAR("Unused, ignore", BOOL TextOnly);
WINPR_DEPRECATED_VAR("Unused, ignore", UINT32 MaxTextLength);
/* gfx settings */
BOOL DecodeGFX;
WINPR_DEPRECATED_VAR("Unused, ignore", BOOL DecodeGFX);
/* modules */
char** Modules; /* module file names to load */

50
server/proxy/pf_config.c
View File

@ -75,13 +75,6 @@ static const char* key_target_pwd = "Password";
static const char* key_target_domain = "Domain";
static const char* key_target_tls_seclevel = "TlsSecLevel";
static const char* section_clipboard = "Clipboard";
static const char* key_clip_text_only = "TextOnly";
static const char* key_clip_text_max_len = "MaxTextLength";
static const char* section_gfx_settings = "GFXSettings";
static const char* key_gfx_decode = "DecodeGFX";
static const char* section_plugins = "Plugins";
static const char* key_plugins_modules = "Modules";
static const char* key_plugins_required = "Required";
@ -358,18 +351,6 @@ static BOOL pf_config_load_security(wIniFile* ini, proxyConfig* config)
return TRUE;
}
static BOOL pf_config_load_clipboard(wIniFile* ini, proxyConfig* config)
{
WINPR_ASSERT(config);
config->TextOnly = pf_config_get_bool(ini, section_clipboard, key_clip_text_only, FALSE);
if (!pf_config_get_uint32(ini, section_clipboard, key_clip_text_max_len, &config->MaxTextLength,
FALSE))
return FALSE;
return TRUE;
}
static BOOL pf_config_load_modules(wIniFile* ini, proxyConfig* config)
{
const char* modules_to_load = NULL;
@ -386,13 +367,6 @@ static BOOL pf_config_load_modules(wIniFile* ini, proxyConfig* config)
return TRUE;
}
static BOOL pf_config_load_gfx_settings(wIniFile* ini, proxyConfig* config)
{
WINPR_ASSERT(config);
config->DecodeGFX = pf_config_get_bool(ini, section_gfx_settings, key_gfx_decode, FALSE);
return TRUE;
}
static char* pf_config_decode_base64(const char* data, const char* name, size_t* pLength)
{
const char* headers[] = { "-----BEGIN PUBLIC KEY-----", "-----BEGIN RSA PUBLIC KEY-----",
@ -603,12 +577,6 @@ proxyConfig* server_config_load_ini(wIniFile* ini)
if (!pf_config_load_modules(ini, config))
goto out;
if (!pf_config_load_clipboard(ini, config))
goto out;
if (!pf_config_load_gfx_settings(ini, config))
goto out;
if (!pf_config_load_certificates(ini, config))
goto out;
config->ini = IniFile_Clone(ini);
@ -711,16 +679,6 @@ BOOL pf_server_config_dump(const char* file)
"module1,module2,...") < 0)
goto fail;
/* Clipboard configuration */
if (IniFile_SetKeyValueString(ini, section_clipboard, key_clip_text_only, bool_str_false) < 0)
goto fail;
if (IniFile_SetKeyValueInt(ini, section_clipboard, key_clip_text_max_len, 0) < 0)
goto fail;
/* GFX configuration */
if (IniFile_SetKeyValueString(ini, section_gfx_settings, key_gfx_decode, bool_str_false) < 0)
goto fail;
/* Certificate configuration */
if (IniFile_SetKeyValueString(ini, section_certificates, key_cert_file,
"<absolute path to some certificate file> OR") < 0)
@ -862,14 +820,6 @@ void pf_server_config_print(const proxyConfig* config)
pf_server_config_print_list(config->Intercept, config->InterceptCount);
}
CONFIG_PRINT_SECTION(section_clipboard);
CONFIG_PRINT_BOOL(config, TextOnly);
if (config->MaxTextLength > 0)
CONFIG_PRINT_UINT32(config, MaxTextLength);
CONFIG_PRINT_SECTION(section_gfx_settings);
CONFIG_PRINT_BOOL(config, DecodeGFX);
/* modules */
CONFIG_PRINT_SECTION_KEY(section_plugins, key_plugins_modules);
for (size_t x = 0; x < config->ModulesCount; x++)