[X2Go-Commits] [x2goclient] 02/02: SSH with GSSAPI: Don't assume the broker-side user has /bin/sh (or compatible) set as default shell. (Fixes: #720).
git-admin at x2go.org
git-admin at x2go.org
Fri Jan 9 20:49:59 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goclient.
commit ccb864b0bf57785d4405f9bc4947ffb9897a4351
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Jan 9 20:49:25 2015 +0100
SSH with GSSAPI: Don't assume the broker-side user has /bin/sh (or compatible) set as default shell. (Fixes: #720).
---
debian/changelog | 2 ++
sshmasterconnection.cpp | 2 +-
sshprocess.cpp | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3e67cf4..8820888 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium
- Fix string concatenation/layout of error message when tunnel I/O errors
occur.
- Improve debugging/logging the SSH connections made by X2Go Client.
+ - SSH with GSSAPI: Don't assume the broker-side user has /bin/sh (or
+ compatible) set as default shell. (Fixes: #720).
[ Jason Alavaliant ]
* New upstream verson (4.0.3.2):
diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp
index 9ad8c1f..b09f04f 100755
--- a/sshmasterconnection.cpp
+++ b/sshmasterconnection.cpp
@@ -1139,7 +1139,7 @@ bool SshMasterConnection::userAuthKrb()
QUuid uuid = QUuid::createUuid();
QString uuidStr = uuid.toString().mid(1, 36).toLower();
- QString shcmd = " echo X2GODATABEGIN:" + uuidStr + "; whoami; echo X2GODATAEND:" + uuidStr ;
+ QString shcmd = "sh -c 'echo X2GODATABEGIN:" + uuidStr + "; whoami; echo X2GODATAEND:" + uuidStr +";'";
#ifdef Q_OS_WIN
sshCmd="plink -batch "+user+"@"+host+" -P "+
diff --git a/sshprocess.cpp b/sshprocess.cpp
index 7cd6f45..6ad7579 100755
--- a/sshprocess.cpp
+++ b/sshprocess.cpp
@@ -198,7 +198,7 @@ void SshProcess::startNormal(const QString& cmd)
else
{
QString host=masterCon->getHost();
- QString shcmd = "echo X2GODATABEGIN:" + uuidStr + "; PATH=/usr/local/bin:/usr/bin:/bin "+cmd+"; echo X2GODATAEND:" + uuidStr;
+ QString shcmd = "sh -c 'echo X2GODATABEGIN:" + uuidStr + "; PATH=/usr/local/bin:/usr/bin:/bin "+cmd+"; echo X2GODATAEND:" + uuidStr +"';";
proc=new QProcess(this);
#ifdef Q_OS_WIN
if(masterCon->get_kerberosDelegation())
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list