You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2018/11/10 01:43:12 UTC
[2/3] guacamole-server git commit: GUACAMOLE-649: Allow SSH
connection to continue despite failure to set LANG environment variable.
GUACAMOLE-649: Allow SSH connection to continue despite failure to set LANG environment variable.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/edbdd084
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/edbdd084
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/edbdd084
Branch: refs/heads/master
Commit: edbdd08476df063297af0f8977e2df59c7c4fd02
Parents: 4546829
Author: Michael Jumper <mj...@apache.org>
Authored: Thu Nov 8 19:29:10 2018 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Thu Nov 8 19:29:32 2018 -0800
----------------------------------------------------------------------
src/protocols/ssh/ssh.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/edbdd084/src/protocols/ssh/ssh.c
----------------------------------------------------------------------
diff --git a/src/protocols/ssh/ssh.c b/src/protocols/ssh/ssh.c
index fa2aaf6..80b84de 100644
--- a/src/protocols/ssh/ssh.c
+++ b/src/protocols/ssh/ssh.c
@@ -324,10 +324,9 @@ void* ssh_client_thread(void* data) {
if (settings->locale != NULL) {
if (libssh2_channel_setenv(ssh_client->term_channel, "LANG",
settings->locale)) {
- guac_client_abort(client, GUAC_PROTOCOL_STATUS_UPSTREAM_ERROR,
+ guac_client_log(client, GUAC_LOG_WARNING,
"Unable to forward locale: SSH server refused to set "
"\"LANG\" environment variable.");
- return NULL;
}
}