[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99-2-305-gb8c2618

[X2go dev team]

The branch, master has been updated
       via  b8c2618c8f1efaf4ea3aa320538577c7481a54af (commit)
       via  059350c3ab42affeae78e7b14042838f46b69acd (commit)
       via  b24531392088b16364a4e3730630f16dcdc0ec2f (commit)
      from  f0c85abd21ffd6354044fee40a4ecc6e0a3fdec9 (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 -----------------------------------------------------------------
commit b8c2618c8f1efaf4ea3aa320538577c7481a54af
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Sep 25 20:56:38 2011 +0200

    Clean session dir ~/.x2go/C-<session_id> after session terminates, if not running in debug mode.

commit 059350c3ab42affeae78e7b14042838f46b69acd
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Sep 25 03:30:54 2011 +0200

    Pass extra argument $USER to client-mode x2godesktopsharing, requires x2godesktopsharing (>=3.0.1.3) for it to work.

commit b24531392088b16364a4e3730630f16dcdc0ec2f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Sep 25 03:28:47 2011 +0200

    log message improvement

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                     |    4 ++++
 x2goserver/bin/x2goruncommand        |    4 ++++
 x2goserver/bin/x2gostartagent        |    6 +++---
 x2goserver/bin/x2goterminate-session |    4 ++++
 4 files changed, 15 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 8890f61..f284e08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -87,6 +87,10 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
   * Makefile update for including x2gofeature scripts into installation, minor fixes
     to x2goserver core package Makefile.
   * Add debug output around shadow session startup (in x2gostartagent).
+  * Pass extra argument $USER to client-mode x2godesktopsharing, requires
+    x2godesktopsharing (>=3.0.1.3) for it to work.
+  * Clean session dir ~/.x2go/C-<session_id> after session terminates, if not
+    running in debug mode.
 
   [ Ivan Kabaivanov ]
   * Makefile fix around man page installation in x2goserver-compat package.
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 7e8db47..345ad33 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -128,3 +128,7 @@ kill -TERM  $X2GO_AGENT_PID
 $X2GO_LIB_PATH/x2gochangestatus 'F' $X2GO_SESSION  > /dev/null
 export HOSTNAME
 x2goumount-session $X2GO_SESSION
+
+if [ "$($X2GO_LIB_PATH/x2gologlevel)" != "debug" ]; then
+    rm -Rf $HOME/.x2go/C-$X2GO_SESSION
+fi
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 765268a..2759865 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -53,9 +53,9 @@ if [ "$X2GO_STYPE" == "S" ]; then
 
 	if [ "$SHADOW_USER" != "$USER" ]; then
 
-		$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "user $USER requests desktop sharing from user $SHADOW_USER on display $SHADOW_DISPLAY"
-		$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing command: x2godesktopsharing client $X2GO_CLIENT $@"
-		OUTPUT=`x2godesktopsharing client $X2GO_CLIENT $@`
+		$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "user ,,$USER'' requests desktop sharing from user ,,$SHADOW_USER'' for desktop ,,$SHADOW_DESKTOP''"
+		$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing command: x2godesktopsharing client $X2GO_CLIENT $@ $USER"
+		OUTPUT=`x2godesktopsharing client $X2GO_CLIENT $@ $USER`
 		$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "command result is: $OUTPUT"
 		if [ "$OUTPUT" == "DENY" ]; then
 			echo "ACCESS DENIED" 1>&2
diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session
index bcd1f9f..5b1cd23 100755
--- a/x2goserver/bin/x2goterminate-session
+++ b/x2goserver/bin/x2goterminate-session
@@ -48,3 +48,7 @@ kill -TERM $X2GO_AGENT_PID &>/dev/null && {
 
 export HOSTNAME
 x2goumount-session $SESSION_NAME
+
+if [ "$($X2GO_LIB_PATH/x2gologlevel)" != "debug" ]; then
+    rm -Rf $HOME/.x2go/C-$SESSION_NAME
+fi


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).