This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit f827dc498832237996dae7e7e054849fcfcb4638 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 12 05:52:28 2014 +0100 Revert "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..." This reverts commit c9e4818177bfa6f9c3ec46cdae230197ce0c77d2. --- debian/changelog | 6 ------ sharetray.cpp | 10 +++++----- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 709aada..d38e33d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,12 +12,6 @@ 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 f16aaf7..712af15 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 not enough session parameters"; + return "DENY wrong number of session parameters"; } - QStringList params=lst[10].split ( "XSHAD" ); + QStringList params=lst[9].split ( "XSHAD" ); if ( params.size() !=3 ) { qDebug() <<"wrong parameters"; return "DENY wrong session name"; } - QString client=lst[1]; + QString client=lst[0]; QString user=params[1]; - QString remote_user=lst[0]; + QString remote_user=lst[10]; 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