You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2018/03/08 19:15:17 UTC
[1/3] guacamole-server git commit: GUACAMOLE-523: Pass configured
client name through for redirect messages.
Repository: guacamole-server
Updated Branches:
refs/heads/master bc1e2f527 -> 344ed4f42
GUACAMOLE-523: Pass configured client name through for redirect messages.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/b72bcafe
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/b72bcafe
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/b72bcafe
Branch: refs/heads/master
Commit: b72bcafecd87e5d3d7fee54faafcc35ac68c15b6
Parents: bc1e2f5
Author: Nick Couchman <vn...@apache.org>
Authored: Thu Mar 8 12:16:31 2018 -0500
Committer: Nick Couchman <vn...@apache.org>
Committed: Thu Mar 8 12:16:31 2018 -0500
----------------------------------------------------------------------
src/protocols/rdp/guac_rdpdr/rdpdr_messages.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/b72bcafe/src/protocols/rdp/guac_rdpdr/rdpdr_messages.c
----------------------------------------------------------------------
diff --git a/src/protocols/rdp/guac_rdpdr/rdpdr_messages.c b/src/protocols/rdp/guac_rdpdr/rdpdr_messages.c
index 38a31a1..fc9cd0f 100644
--- a/src/protocols/rdp/guac_rdpdr/rdpdr_messages.c
+++ b/src/protocols/rdp/guac_rdpdr/rdpdr_messages.c
@@ -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);
}
[2/3] guacamole-server git commit: GUACAMOLE-523: Add default value
for client name.
Posted by mj...@apache.org.
GUACAMOLE-523: Add default value for client name.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/a2775768
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/a2775768
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/a2775768
Branch: refs/heads/master
Commit: a27757682aca4bb415209ffeaa18a0cc45b58ef1
Parents: b72bcaf
Author: Nick Couchman <vn...@apache.org>
Authored: Thu Mar 8 12:21:04 2018 -0500
Committer: Nick Couchman <vn...@apache.org>
Committed: Thu Mar 8 12:21:04 2018 -0500
----------------------------------------------------------------------
src/protocols/rdp/rdp_settings.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/a2775768/src/protocols/rdp/rdp_settings.c
----------------------------------------------------------------------
diff --git a/src/protocols/rdp/rdp_settings.c b/src/protocols/rdp/rdp_settings.c
index b0f9582..35f7f20 100644
--- a/src/protocols/rdp/rdp_settings.c
+++ b/src/protocols/rdp/rdp_settings.c
@@ -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 =
[3/3] guacamole-server git commit: GUACAMOLE-523: Merge changes
registering RDPDR devices using the configured RDP client name.
Posted by mj...@apache.org.
GUACAMOLE-523: Merge changes registering RDPDR devices using the configured RDP client name.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/344ed4f4
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/344ed4f4
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/344ed4f4
Branch: refs/heads/master
Commit: 344ed4f42ea715a2e0e7dfd09867964ecfc320c2
Parents: bc1e2f5 a277576
Author: Michael Jumper <mj...@apache.org>
Authored: Thu Mar 8 11:14:37 2018 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Thu Mar 8 11:14:37 2018 -0800
----------------------------------------------------------------------
src/protocols/rdp/guac_rdpdr/rdpdr_messages.c | 3 ++-
src/protocols/rdp/rdp_settings.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------