[X2Go-Commits] x2goclient.git - master (branch) updated: 4.0.1.1-71-g9d714e3
X2Go dev team
git-admin at x2go.org
Mon Dec 16 18:29:09 CET 2013
The branch, master has been updated
via 9d714e35d68e68dda9dfbc5fe737626179a009e4 (commit)
from 6290a9f307423210fdb7f8f08f2eb9c52e5ad551 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9d714e35d68e68dda9dfbc5fe737626179a009e4
Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
Date: Mon Dec 16 18:29:00 2013 +0100
fixed GSSApi(Kerberos 5) authentication for sshproxy and sshbroker on windows
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 ++
sshmasterconnection.cpp | 1 -
sshprocess.cpp | 16 ++++++++++++++--
3 files changed, 16 insertions(+), 3 deletions(-)
mode change 100644 => 100755 sshmasterconnection.cpp
mode change 100644 => 100755 sshprocess.cpp
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index e27b1a9..af05070 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -69,6 +69,8 @@ x2goclient (4.0.1.2-0x2go2) UNRELEASED; urgency=low
- SshMasterConnection should use current user name if no user name is
specified in session settings
- GSSApi(Kerberos 5) authentication for sshproxy and sshbroker
+ - fixed GSSApi(Kerberos 5) authentication for sshproxy and sshbroker
+ on windows
[ Heinrich Schuchardt ]
* New upstream version (4.0.1.2):
diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp
old mode 100644
new mode 100755
index 092cf9c..aa8269d
--- a/sshmasterconnection.cpp
+++ b/sshmasterconnection.cpp
@@ -957,7 +957,6 @@ bool SshMasterConnection::userAuthWithPass()
bool SshMasterConnection::userAuthAuto()
{
- x2goDebug<<"auth auto";
int rc = ssh_userauth_autopubkey ( my_ssh_session, "" );
int i=0;
while(rc != SSH_AUTH_SUCCESS)
diff --git a/sshprocess.cpp b/sshprocess.cpp
old mode 100644
new mode 100755
index b147150..2db1c51
--- a/sshprocess.cpp
+++ b/sshprocess.cpp
@@ -72,7 +72,15 @@ SshProcess::~SshProcess()
proc->terminate();
}
}
- delete proc;
+ if (proc->state()==QProcess::Running)
+ {
+ proc->kill();
+ }
+ if(proc->state()!=QProcess::Running)
+ {
+ delete proc;
+ }
+ proc=0;
}
if (serverSocket>0)
{
@@ -273,7 +281,7 @@ void SshProcess::startTunnel(const QString& forwardHost, uint forwardPort, const
}
else
{
- proc=new QProcess(this);
+ proc=new QProcess(0);
#ifdef Q_OS_WIN
QString sshString="plink -batch -P "+
#else
@@ -319,7 +327,11 @@ void SshProcess::slotStdErr(SshProcess* creator, QByteArray data)
if(tunnel && !tunnelOkEmited)
{
+#ifdef Q_OS_WIN
+ if(stdErrString.indexOf("Access granted")!=-1)
+#else
if(stdErrString.indexOf("Entering interactive session")!=-1)
+#endif
{
tunnelOkEmited=true;
emit sshTunnelOk(pid);
hooks/post-receive
--
x2goclient.git (X2Go Client)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goclient.git" (X2Go Client).
More information about the x2go-commits
mailing list