[X2Go-Commits] [x2goclient] 01/01: Windows: Fix not being able to add the server to the known_hosts file when the username has non-English characters.
git-admin at x2go.org
git-admin at x2go.org
Tue Sep 16 02:53:08 CEST 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goclient.
commit 2ffcad0348aeef11210d4863bc466a4b231fdc7d
Author: Mike DePaulo <mikedep333 at gmail.com>
Date: Mon Sep 15 20:52:48 2014 -0400
Windows: Fix not being able to add the server to the known_hosts file when the username has non-English characters.
---
debian/changelog | 6 ++++++
sshmasterconnection.cpp | 11 ++++++++---
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d83c075..a58e2b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,12 @@ x2goclient (4.0.3.0-0x2go1) UNRELEASED; urgency=low
[ Mike DePaulo ]
* New upstream release (4.0.3.0):
+ - Windows: Fix not being able to add the server to the known_hosts file when
+ the username has non-English characters.
+ (NOTE: This fix only works when the non-English characters are in the same
+ language as the Windows "system locale" AKA "Language for non-Unicode
+ programs." Bug #611 was written for fixing the issue for languages other
+ than the system locale.)
- Windows: Install VcXsrv "misc" fonts by default, and make all 4 font
groups optional: misc, 75dpi, 100dpi and others (Fixes: #108)
Note: The fact that all the fonts are included makes the installer about
diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp
index 827eefe..8c89194 100755
--- a/sshmasterconnection.cpp
+++ b/sshmasterconnection.cpp
@@ -518,7 +518,7 @@ void SshMasterConnection::run()
}
#ifdef Q_OS_WIN
- ssh_options_set ( my_ssh_session, SSH_OPTIONS_SSH_DIR, (mainWnd->getHomeDirectory()+"/ssh").toAscii());
+ ssh_options_set ( my_ssh_session, SSH_OPTIONS_SSH_DIR, (mainWnd->getHomeDirectory()+"/ssh").toLocal8Bit());
if (kerberos)
{
parseKnownHosts();
@@ -625,10 +625,15 @@ void SshMasterConnection::run()
#endif
return;
}
- ssh_options_set ( my_ssh_session, SSH_OPTIONS_USER, user.toAscii() );
+
#ifdef Q_OS_WIN
- ssh_options_set ( my_ssh_session, SSH_OPTIONS_SSH_DIR, (mainWnd->getHomeDirectory()+"/ssh").toAscii());
+ ssh_options_set ( my_ssh_session, SSH_OPTIONS_USER, user.toLocal8Bit() );
+#else
+ ssh_options_set ( my_ssh_session, SSH_OPTIONS_USER, user.toAscii() );
+#endif
+#ifdef Q_OS_WIN
+ ssh_options_set ( my_ssh_session, SSH_OPTIONS_SSH_DIR, (mainWnd->getHomeDirectory()+"/ssh").toLocal8Bit());
#ifdef DEBUG
x2goDebug<<"setting SSH DIR to "<<mainWnd->getHomeDirectory()+"/ssh";
#endif
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list