[X2Go-Commits] x2goserver.git - build-main (branch) updated: 3.1.1.1-2-g49688c3
X2Go dev team
git-admin at x2go.org
Wed Dec 4 06:18:19 CET 2013
The branch, build-main has been updated
via 49688c37bb09861fee632a40130278e312f6216b (commit)
from 612f5ecbe31f42cbeb5148d9126660e09bbc7adb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 6 +++++-
x2goserver/bin/x2goruncommand | 2 +-
x2goserver/bin/x2gostartagent | 16 ++++++++++++----
x2goserver/sbin/x2gocleansessions | 2 +-
x2goserver/sbin/x2golistsessions_root | 2 +-
5 files changed, 20 insertions(+), 8 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 29249fc..15413f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
x2goserver (3.1.1.2-0~x2go1) UNRELEASED; urgency=low
- * Continue development...
+ [ Mike Gabriel ]
+ * New upstream version (3.1.1.2):
+ - Place session.log into /tmp directory, make x2gocleansessions and
+ x2golistsessions_root work even if home directories are mounted
+ via NFSv4+Krb5 and not accessible by root.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Tue, 26 Jun 2012 09:32:31 +0200
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 012f713..4884e93 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -246,5 +246,5 @@ test -r /etc/x2go/x2go_logout && . /etc/x2go/x2go_logout
# clean up session dir if not in debug mode and if session has been successful
if [ "$($X2GO_LIB_PATH/x2gologlevel)" != "7" ] && [ "x$successful_run" = "xtrue" ]; then
- (sleep 10; rm -Rf "$HOME/.x2go/C-$X2GO_SESSION")&
+ (sleep 10; rm -Rf "${HOME}/.x2go/C-${X2GO_SESSION}"; rm -f "/tmp/.x2go-${USER}/session-C-${X2GO_SESSION}.log"; )&
fi
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index e772bf4..373ee13 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -190,6 +190,14 @@ fi
SESSION_DIR="${X2GO_ROOT}/C-${SESSION_NAME}"
+# do not use $TMP or $TEMP here, the session.log file location has to be accessible by root
+SESSION_LOG="/tmp/.x2go-${USER}/session-C-${SESSION_NAME}.log"
+mkdir -p $(dirname "${SESSION_LOG}")
+chmod -f 0700 $(dirname "${SESSION_LOG}")
+touch "${SESSION_LOG}"
+chmod -f 0600 "${SESSION_LOG}"
+ln -s "${SESSION_DIR}/session.log" "${SESSION_LOG}"
+
if [ ! -d "$X2GO_ROOT" ]; then
mkdir "$X2GO_ROOT"
fi
@@ -215,9 +223,9 @@ xauth -f "$XAUTHORITY" add "${HOSTNAME}:${X2GO_PORT}" MIT-MAGIC-COOKIE-1 "${X2GO
if [ "$X2GO_SET_KBD" == "0" ] || [ "$X2GO_KBD_TYPE" == "auto" ];then
- X2GO_HOST="nx/nx,link=${X2GO_LINK},pack=${X2GO_PACK},limit=0,root=${SESSION_DIR},cache=8M,images=32M,type=${X2GO_TYPE},id=${SESSION_NAME},cookie=$X2GO_COOKIE,errors=${SESSION_DIR}/session.log,kbtype=null/null,geometry=${X2GO_GEOMETRY},resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT},client=linux,menu=0"
+ X2GO_HOST="nx/nx,link=${X2GO_LINK},pack=${X2GO_PACK},limit=0,root=${SESSION_DIR},cache=8M,images=32M,type=${X2GO_TYPE},id=${SESSION_NAME},cookie=$X2GO_COOKIE,errors=${SESSION_LOG},kbtype=null/null,geometry=${X2GO_GEOMETRY},resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT},client=linux,menu=0"
else
- X2GO_HOST="nx/nx,link=${X2GO_LINK},pack=${X2GO_PACK},limit=0,root=${SESSION_DIR},cache=8M,images=32M,type=${X2GO_TYPE},id=${SESSION_NAME},cookie=$X2GO_COOKIE,errors=${SESSION_DIR}/session.log,kbtype=${X2GO_KBD_TYPE},geometry=${X2GO_GEOMETRY},resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT},client=linux,menu=0"
+ X2GO_HOST="nx/nx,link=${X2GO_LINK},pack=${X2GO_PACK},limit=0,root=${SESSION_DIR},cache=8M,images=32M,type=${X2GO_TYPE},id=${SESSION_NAME},cookie=$X2GO_COOKIE,errors=${SESSION_LOG},kbtype=${X2GO_KBD_TYPE},geometry=${X2GO_GEOMETRY},resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT},client=linux,menu=0"
fi
@@ -247,9 +255,9 @@ x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSI
SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}"
if [ "$X2GO_STYPE" == "S" ]; then
- x2goagent -nolisten tcp $X2GODPIOPTION_ -$SESSION_TYPE -auth "$XAUTHORITY" -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_DIR}/session.log" &
+ x2goagent -nolisten tcp $X2GODPIOPTION_ -$SESSION_TYPE -auth "$XAUTHORITY" -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" &
else
- x2goagent -nolisten tcp $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_DIR}/session.log" &
+ x2goagent -nolisten tcp $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" &
fi
X2GO_AGENT_PID=$!
diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions
index 6e21482..9263d61 100755
--- a/x2goserver/sbin/x2gocleansessions
+++ b/x2goserver/sbin/x2gocleansessions
@@ -55,7 +55,7 @@ sub check_stat
{
my $sess=shift;
my $user=shift;
- my $log="~$user/.x2go/C-$sess/session.log";
+ my $log="/tmp/.x2go-${user}/session-C-${sess}.log";
my $text=`tail -1 $log 2>/dev/null`;
if ($text =~ m/Session suspended/)
{
diff --git a/x2goserver/sbin/x2golistsessions_root b/x2goserver/sbin/x2golistsessions_root
index dddcae3..71fc5dd 100755
--- a/x2goserver/sbin/x2golistsessions_root
+++ b/x2goserver/sbin/x2golistsessions_root
@@ -34,7 +34,7 @@ sub check_stat
{
my $sess=shift;
my $user=shift;
- my $log="~$user/.x2go/C-$sess/session.log";
+ my $log="/tmp/.x2go-${user}/session-C-${sess}.log";
my $text=`tail -1 $log 2>/dev/null`;
if ($text =~ m/Session suspended/)
{
hooks/post-receive
--
x2goserver.git (X2Go Server)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goserver.git" (X2Go Server).
More information about the x2go-commits
mailing list