Commit 5f9bb3b4 for guacamole.apache.org
commit 5f9bb3b4f81bcfda357d09920b2c23acb739423a
Merge: ecca029b a492e087
Author: Virtually Nick <vnick@apache.org>
Date: Fri Oct 16 20:40:35 2026 -0400
Merge patch branch changes to main.
diff --cc src/protocols/rdp/user.c
index 095686d6,a3b01eee..57e12340
--- a/src/protocols/rdp/user.c
+++ b/src/protocols/rdp/user.c
@@@ -66,13 -67,9 +67,13 @@@ int guac_rdp_user_join_handler(guac_use
/* Store owner's settings at client level */
rdp_client->settings = settings;
+ /* Init clipboard */
+ rdp_client->clipboard =
+ guac_rdp_clipboard_alloc(user->client, settings->clipboard_buffer_size);
+
/* Start client thread */
- if (pthread_create(&rdp_client->client_thread, NULL,
- guac_rdp_client_thread, user->client)) {
+ if (guac_thread_create(&rdp_client->client_thread,
+ guac_rdp_client_thread, user->client, "rdp-client")) {
guac_user_log(user, GUAC_LOG_ERROR,
"Unable to start RDP client thread.");
return 1;
diff --cc src/protocols/vnc/user.c
index 0c7e182b,dd1c7eec..a092eaf1
--- a/src/protocols/vnc/user.c
+++ b/src/protocols/vnc/user.c
@@@ -62,12 -63,8 +63,12 @@@ int guac_vnc_user_join_handler(guac_use
/* Store owner's settings at client level */
vnc_client->settings = settings;
+ /* Init clipboard. */
+ vnc_client->clipboard =
+ guac_common_clipboard_alloc(settings->clipboard_buffer_size);
+
/* Start client thread */
- if (pthread_create(&vnc_client->client_thread, NULL, guac_vnc_client_thread, user->client)) {
+ if (guac_thread_create(&vnc_client->client_thread, guac_vnc_client_thread, user->client, "vnc-client")) {
guac_user_log(user, GUAC_LOG_ERROR, "Unable to start VNC client thread.");
return 1;
}