diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 17:19:20 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 17:19:20 +0000 |
| commit | 40dbff2608bd68130462f45c02495db7e1acac6b (patch) | |
| tree | 062faaba0bdc95f0103e22dca82461279694146b /plugins/rdp/rdp_plugin.c | |
| parent | Adding debian version 1.4.34+dfsg-1. (diff) | |
| download | remmina-40dbff2608bd68130462f45c02495db7e1acac6b.tar.xz remmina-40dbff2608bd68130462f45c02495db7e1acac6b.zip | |
Merging upstream version 1.4.35+dfsg.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'plugins/rdp/rdp_plugin.c')
| -rw-r--r-- | plugins/rdp/rdp_plugin.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/plugins/rdp/rdp_plugin.c b/plugins/rdp/rdp_plugin.c index 68ea505..1e691ea 100644 --- a/plugins/rdp/rdp_plugin.c +++ b/plugins/rdp/rdp_plugin.c @@ -115,7 +115,9 @@ #if FREERDP_VERSION_MAJOR < 3 static HANDLE freerdp_abort_event(rdpContext* context) { +#ifdef WINPR_ASSERT WINPR_ASSERT(context); +#endif return context->abortEvent; } @@ -124,8 +126,9 @@ static BOOL freerdp_settings_set_pointer_len(rdpSettings* settings, size_t id, c switch(id) { case FreeRDP_LoadBalanceInfo: free(settings->LoadBalanceInfo); - settings->LoadBalanceInfo = _strdup(data); - settings->LoadBalanceInfoLength = len; + settings->LoadBalanceInfo = (BYTE *)data; + freerdp_settings_set_uint32(settings, FreeRDP_LoadBalanceInfoLength, strlen(data)); + return TRUE; default: return FALSE; @@ -133,7 +136,9 @@ static BOOL freerdp_settings_set_pointer_len(rdpSettings* settings, size_t id, c } static void freerdp_abort_connect_context(rdpContext* context) { +#ifdef WINPR_ASSERT WINPR_ASSERT(context); +#endif freerdp_abort_connect(context->instance); } #endif @@ -1021,7 +1026,7 @@ static BOOL remmina_rdp_authenticate_ex(freerdp* instance, char** username, char key_title, remmina_plugin_service->file_get_string(remminafile, key_user), remmina_plugin_service->file_get_string(remminafile, key_password), - remmina_plugin_service->file_get_string(remminafile, disablepasswordstoring ? NULL : key_domain), + remmina_plugin_service->file_get_string(remminafile, key_domain), NULL); if (ret == GTK_RESPONSE_OK) { if (cfg_key_user != FreeRDP_STRING_UNUSED) @@ -1881,7 +1886,7 @@ static gboolean remmina_rdp_main(RemminaProtocolWidget *gp) if (remmina_plugin_service->file_get_string(remminafile, "loadbalanceinfo")) { const gchar *tmp = strdup(remmina_plugin_service->file_get_string(remminafile, "loadbalanceinfo")); - freerdp_settings_set_pointer_len(rfi->clientContext.context.settings, FreeRDP_LoadBalanceInfo, tmp, strlen(tmp) + 1); + freerdp_settings_set_pointer_len(rfi->clientContext.context.settings, FreeRDP_LoadBalanceInfo, tmp, strlen(tmp)); } if (remmina_plugin_service->file_get_string(remminafile, "exec")) |