This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from de77b3a fix for f2ca618e1 new 86436f0 Provide pam_namespace support for has_agent_state_file() function. 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: X2Go/Server/Agent/NX.pm | 6 +++++- debian/changelog | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 86436f083923a6e884b7f54bd0ff951f1307291d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Oct 21 09:40:19 2014 +0200 Provide pam_namespace support for has_agent_state_file() function. --- X2Go/Server/Agent/NX.pm | 6 +++++- debian/changelog | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/X2Go/Server/Agent/NX.pm b/X2Go/Server/Agent/NX.pm index 60c0f17..302dce2 100644 --- a/X2Go/Server/Agent/NX.pm +++ b/X2Go/Server/Agent/NX.pm @@ -75,7 +75,11 @@ sub has_agent_state_file { my $sess=@_[1]; my $user=@_[2]; - my $stateFile = "/tmp/.x2go-".$user."/C-".$sess."/state"; + if ( -d "/tmp-inst/${user}/.x2go-${user}" ) { + $stateFile="/tmp-inst/${user}/.x2go-".$user."/C-".$sess."/state"; + } else { + $stateFile = "/tmp/.x2go-".$user."/C-".$sess."/state"; + } if ( -e $stateFile ) { return 1; diff --git a/debian/changelog b/debian/changelog index b913469..1d7c280 100644 --- a/debian/changelog +++ b/debian/changelog @@ -164,6 +164,7 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium sessions on other servers that have session states files on their remote /tmp dirs. These files are not accessible for that x2golistsessions script and should simply be ignored. (Fixes: #638). + - Provide pam_namespace support for has_agent_state_file() function. * debian/control: + Add D (x2goserver): libfile-which-perl. * x2goserver.spec: -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org