This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 165a1c2 common: update copyright notices, whitespace fixes. Happy new year! new 0ca3a82 fix missing curly brackets, caused by commit adb03c67e new ccb864b SSH with GSSAPI: Don't assume the broker-side user has /bin/sh (or compatible) set as default shell. (Fixes: #720). The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 ++ onmainwindow.cpp | 2 ++ sshmasterconnection.cpp | 2 +- sshprocess.cpp | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 0ca3a820e48c64e09568901e5777e0c05672c113 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jan 9 20:39:31 2015 +0100 fix missing curly brackets, caused by commit adb03c67e --- onmainwindow.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/onmainwindow.cpp b/onmainwindow.cpp index b13ab5f..baf69f7 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -1689,8 +1689,10 @@ void ONMainWindow::slotClosePass() if (brokerMode) { if (!config.brokerAuthenticated) + { x2goErrorf(15)<<tr("Broker authenication failed!"); close(); + } } passForm->hide(); if ( !embedMode ) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
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@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
-
git-admin＠x2go.org