This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 416a233 don't exit if sending event to http broker is failed. new 451fba8 debian/changelog: sync with commit history. new 52299f2 src/sshmasterconnection.cpp: close channel on failure in checkLogin (). new 74e4162 onmainwindow.cpp: fix building with Qt 4.6, currently the latest version available in EPEL 6. The 3 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 | 13 +++++++++++++ src/onmainwindow.cpp | 8 +++++++- src/sshmasterconnection.cpp | 7 +++++++ 3 files changed, 27 insertions(+), 1 deletion(-) -- Alioth's /home/x2go-admin/maintenancescripts/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 451fba86315f7bca1b626320f04a2a3256d1db1f Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Jun 16 18:10:40 2019 +0200 debian/changelog: sync with commit history. --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index e894c2d..ac4db93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,13 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium imposiible to find out user name on X2Go server, which is not always the same as broker username. This won't break a compatibility with previous broker as they just will ignore this parameter. + - X2Gokdrive support for X2GoClient. + - Fix authentification on http broker when sending event. + - Fix resuming sessions on multiple servers. + - Initializing sessionId, command and display for direct RDP to complay with standard sessions. + - Direct RDP sesion send to broker event CONNECTED instead of CONNECTING at start of RDP client. + - Fixing setting correct session command when resuming the session. + - Don't exit if sending event to http broker has failed. [ Mihai Moldovan ] * New upstream version (4.1.2.2): -- Alioth's /home/x2go-admin/maintenancescripts/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 52299f25ca1dcbe646585760443139ad1c9b989b Author: Ulrich Sibiller <uli42@gmx.de> Date: Sun Jun 16 18:27:07 2019 +0200 src/sshmasterconnection.cpp: close channel on failure in checkLogin (). --- debian/changelog | 4 ++++ src/sshmasterconnection.cpp | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index ac4db93..f926b20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -130,6 +130,10 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium - Add new translation: Czech. - Second update round of Czech translation + enable it in x2goclient.pro. + [ Ulrich Sibiller ] + * New upstream release (4.1.2.2): + - src/sshmasterconnection.cpp: close channel on failure in checkLogin (). + -- X2Go Release Manager <git-admin@x2go.org> Tue, 26 Jun 2018 00:39:28 +0200 x2goclient (4.1.2.1-0x2go1) unstable; urgency=medium diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp index eb163f0..e9cb6d9 100644 --- a/src/sshmasterconnection.cpp +++ b/src/sshmasterconnection.cpp @@ -1645,6 +1645,7 @@ bool SshMasterConnection::checkLogin() QString err=ssh_get_error ( my_ssh_session ); QString errorMsg=tr ( "%1 failed." ).arg ("ssh_channel_open_session"); x2goDebug<<errorMsg.left (errorMsg.size () - 1)<<": "<<err<<endl; + ssh_channel_free(channel); return false; } if (ssh_channel_request_pty(channel)!=SSH_OK) @@ -1652,6 +1653,7 @@ bool SshMasterConnection::checkLogin() QString err=ssh_get_error ( my_ssh_session ); QString errorMsg=tr ( "%1 failed." ).arg ("ssh_channel_request_pty"); x2goDebug<<errorMsg.left (errorMsg.size () - 1)<<": "<<err<<endl; + ssh_channel_free(channel); return false; } if(ssh_channel_change_pty_size(channel, 80, 24)!=SSH_OK) @@ -1659,6 +1661,7 @@ bool SshMasterConnection::checkLogin() QString err=ssh_get_error ( my_ssh_session ); QString errorMsg=tr ( "%1 failed." ).arg ("ssh_channel_change_pty_size"); x2goDebug<<errorMsg.left (errorMsg.size () - 1)<<": "<<err<<endl; + ssh_channel_free(channel); return false; } if ( ssh_channel_request_exec ( channel, "echo \"LOGIN OK\"" ) != SSH_OK ) @@ -1666,6 +1669,7 @@ bool SshMasterConnection::checkLogin() QString err=ssh_get_error ( my_ssh_session ); QString errorMsg=tr ( "%1 failed." ).arg ("ssh_channel_request_exec"); x2goDebug<<errorMsg.left (errorMsg.size () - 1)<<": "<<err<<endl; + ssh_channel_free(channel); } else { @@ -1678,7 +1682,10 @@ bool SshMasterConnection::checkLogin() { int nbytes = ssh_channel_read_nonblocking(channel, buffer, sizeof(buffer), 0); if (nbytes < 0) + { + ssh_channel_free(channel); return false; + } if (nbytes > 0) { QString inf=QByteArray ( buffer,nbytes ); -- Alioth's /home/x2go-admin/maintenancescripts/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 74e416234a41816788cc836b9148d86847fd2ef1 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Jun 16 18:28:28 2019 +0200 onmainwindow.cpp: fix building with Qt 4.6, currently the latest version available in EPEL 6. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f926b20..9c6ba95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -98,6 +98,8 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium but necessary fonts.* file regeneration hook. - {x2goclient,help,onmainwindow}.cpp: implement new --bypass-cleanup-helper parameter. + - onmainwindow.cpp: fix building with Qt 4.6, currently the latest version + available in EPEL 6. * debian/control: + Add build-depend on pkg-config. * x2goclient.spec: diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 5f8a75a..074d132 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -3561,7 +3561,13 @@ void ONMainWindow::startDirectRDP() // x2goDebug<<"starting direct session with cmd:"<<proxyCmd; nxproxy->start ( proxyCmd ); resumingSession.server=host; - resumingSession.sessionId=user+"-RDP-"+QString::number(QDateTime::currentDateTime().toMSecsSinceEpoch()/1000)+"_stRRDP_dp24"; + resumingSession.sessionId=user+"-RDP-"; +#if QT_VERSION < 0x040700 + resumingSession.sessionId += QString::number(QDateTime::currentDateTime().toTime_t()) +#else + resumingSession.sessionId += QString::number(QDateTime::currentDateTime().toMSecsSinceEpoch()/1000) +#endif + resumingSession.sessionId += "_stRRDP_dp24"; resumingSession.display="RDP"; resumingSession.command="RDP"; resumingSession.crTime=QDateTime::currentDateTime().toString("dd.MM.yy HH:mm:ss"); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org