[X2Go-Commits] [x2goserver] 01/01: Provide pam_namespace support for has_agent_state_file() function.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch release/4.0.1.x
in repository x2goserver.

commit 6c1907e39685267260b0e06dda008ff9499c1f98
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Oct 21 09:40:19 2014 +0200

    Provide pam_namespace support for has_agent_state_file() function.
---
 debian/changelog                      |    1 +
 x2goserver/sbin/x2golistsessions_root |    6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 90e409f..3ee5c9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,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:
diff --git a/x2goserver/sbin/x2golistsessions_root b/x2goserver/sbin/x2golistsessions_root
index 00dbd67..8eb87a1 100755
--- a/x2goserver/sbin/x2golistsessions_root
+++ b/x2goserver/sbin/x2golistsessions_root
@@ -45,7 +45,11 @@ sub has_agent_state_file
 {
 	my $sess=@_[0];
 	my $user=@_[1];
-	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;

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git