GUACAMOLE-523: Merge changes registering RDPDR devices using the configured RDP client name.

This commit is contained in:
Michael Jumper 2018-03-08 11:14:37 -08:00
commit 344ed4f42e
2 changed files with 3 additions and 2 deletions

View File

@ -19,6 +19,7 @@
#include "config.h"
#include "rdp.h"
#include "rdpdr_messages.h"
#include "rdpdr_service.h"
@ -161,7 +162,7 @@ void guac_rdpdr_process_server_announce(guac_rdpdrPlugin* rdpdr,
guac_rdpdr_send_client_announce_reply(rdpdr, major, minor, client_id);
/* Name request */
guac_rdpdr_send_client_name_request(rdpdr, "Guacamole RDP");
guac_rdpdr_send_client_name_request(rdpdr, ((guac_rdp_client *)rdpdr->client->data)->settings->client_name);
}

View File

@ -667,7 +667,7 @@ guac_rdp_settings* guac_rdp_parse_args(guac_user* user,
/* Client name */
settings->client_name =
guac_user_parse_args_string(user, GUAC_RDP_CLIENT_ARGS, argv,
IDX_CLIENT_NAME, NULL);
IDX_CLIENT_NAME, "Guacamole RDP");
/* Initial program */
settings->initial_program =