This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2godesktopsharing. from 4764a2a fix for last commit (as it broke X2Go Client) new c9e4818 Change in desktop sharing startup. We have to be able to extend the number of session parameters in x2gostartagent (we added the clipboard field recently). So, relevant informtion for x2godesktopsharing needs to be listed first, then the unimportant options (for desktop sharing). Moving the $USER variable to the front then... The 1 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 | 6 ++++++ sharetray.cpp | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit c9e4818177bfa6f9c3ec46cdae230197ce0c77d2 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Nov 1 08:11:14 2014 +0100 Change in desktop sharing startup. We have to be able to extend the number of session parameters in x2gostartagent (we added the clipboard field recently). So, relevant informtion for x2godesktopsharing needs to be listed first, then the unimportant options (for desktop sharing). Moving the $USER variable to the front then... --- debian/changelog | 6 ++++++ sharetray.cpp | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index eec7c8f..e3adb95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,12 @@ x2godesktopsharing (3.1.1.2-0x2go1) UNRELEASED; urgency=low - Set Categories= field in x2godesktopsharing.desktop to Qt;KDE;Application;Network;RemoteAccess; - Provide debug output when we DENY session startup. + - Change in desktop sharing startup. We have to be able to extend the + number of session parameters in x2gostartagent (we added the + clipboard field recently). So, relevant informtion for + x2godesktopsharing needs to be listed first, then the unimportant + options (for desktop sharing). Moving the $USER variable to the front + then... * debian/control: + Raise versioned D (x2godesktopsharing): x2goserver (>= 4.0.1.19). * x2godesktopsharing.spec: diff --git a/sharetray.cpp b/sharetray.cpp index 712af15..f16aaf7 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -373,20 +373,20 @@ QString ShareTray::getSocketAnswer ( QString message ) { qDebug() <<"message: "<<message; QStringList lst=message.split ( ' ' ); - if ( lst.size() !=11 ) + if ( lst.size() <= 11 ) { qDebug() <<"wrong parameters"; - return "DENY wrong number of session parameters"; + return "DENY not enough session parameters"; } - QStringList params=lst[9].split ( "XSHAD" ); + QStringList params=lst[10].split ( "XSHAD" ); if ( params.size() !=3 ) { qDebug() <<"wrong parameters"; return "DENY wrong session name"; } - QString client=lst[0]; + QString client=lst[1]; QString user=params[1]; - QString remote_user=lst[10]; + QString remote_user=lst[0]; if ( getAccess ( remote_user, client ) ==QMessageBox::Yes ) { trayMessage ( tr ( "Access granted" ),QString ( tr ( "%1(%2): access granted" ) ).arg (remote_user ).arg ( client ) ); -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
-
git-admin＠x2go.org