This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2godesktopsharing. from 56b579f Own directories that we put files in. new ac3dfad fix upstream version string new 16cfb73 Provide debug output when we DENY session startup. 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 | 1 + sharetray.cpp | 10 +++++----- 2 files changed, 6 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 ac3dfadefcfd6642478bb1b7b528305770bb7e1e Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Nov 1 00:54:49 2014 +0100 fix upstream version string --- sharetray.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sharetray.cpp b/sharetray.cpp index ffc07d0..97ac247 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -36,7 +36,7 @@ #include <QProcess> #define STAT_ACT_COUNT 10 -#define VERSION "3.0.1.6" +#define VERSION "3.1.1.2" //needed to not get an undefined reference to static members int ShareTray::sigkeybintFd[2]; -- 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 16cfb7303a4236d83e270647dce5d905fb055dd4 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Nov 1 01:14:40 2014 +0100 Provide debug output when we DENY session startup. --- debian/changelog | 1 + sharetray.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index c7bcde7..11ca59e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ x2godesktopsharing (3.1.1.2-0x2go1) UNRELEASED; urgency=low - Add GenericName= field to x2godesktopsharing.desktop. - Set Categories= field in x2godesktopsharing.desktop to Qt;KDE;Application;Network;RemoteAccess; + - Provide debug output when we DENY session startup. * x2godesktopsharing.spec: + Adapt to building on openSUSE/SLES. + Add x2godesktopsharing-rpmlintrc. diff --git a/sharetray.cpp b/sharetray.cpp index 97ac247..ba5f557 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -376,13 +376,13 @@ QString ShareTray::getSocketAnswer ( QString message ) if ( lst.size() !=11 ) { qDebug() <<"wrong parameters"; - return "DENY"; + return "DENY|wrong number of session parameters"; } QStringList params=lst[9].split ( "XSHAD" ); if ( params.size() !=3 ) { qDebug() <<"wrong parameters"; - return "DENY"; + return "DENY|wrong session name"; } QString client=lst[0]; QString user=params[1]; @@ -396,7 +396,7 @@ QString ShareTray::getSocketAnswer ( QString message ) proc.start ( "x2gostartagent",lst ); if ( !proc.waitForFinished ( 5000 ) ) { - return "DENY"; + return "DENY|x2gostartagent timed out"; } else { @@ -423,7 +423,7 @@ QString ShareTray::getSocketAnswer ( QString message ) } trayMessage ( tr ( "Access denied" ),QString ( tr ( "%1(%2): access denied" ) ).arg ( remote_user ).arg ( client ) ); - return "DENY"; + return "DENY|access denied"; } void ShareTray::closeSocket ( SimpleLocalSocket* sock ) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
-
git-admin＠x2go.org