Merge 1.4.0 changes back to master.
This commit is contained in:
commit
90322cd4d3
@ -278,10 +278,13 @@ static int guacd_route_connection(guacd_proc_map* map, guac_socket* socket) {
|
|||||||
proc = guacd_proc_map_retrieve(map, identifier);
|
proc = guacd_proc_map_retrieve(map, identifier);
|
||||||
new_process = 0;
|
new_process = 0;
|
||||||
|
|
||||||
/* Warn if requested connection does not exist */
|
/* Warn and ward off client if requested connection does not exist */
|
||||||
if (proc == NULL)
|
if (proc == NULL) {
|
||||||
guacd_log(GUAC_LOG_INFO, "Connection \"%s\" does not exist.",
|
guacd_log(GUAC_LOG_INFO, "Connection \"%s\" does not exist", identifier);
|
||||||
identifier);
|
guac_protocol_send_error(socket, "No such connection.",
|
||||||
|
GUAC_PROTOCOL_STATUS_RESOURCE_NOT_FOUND);
|
||||||
|
}
|
||||||
|
|
||||||
else
|
else
|
||||||
guacd_log(GUAC_LOG_INFO, "Joining existing connection \"%s\"",
|
guacd_log(GUAC_LOG_INFO, "Joining existing connection \"%s\"",
|
||||||
identifier);
|
identifier);
|
||||||
|
Loading…
Reference in New Issue
Block a user