[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.1-9-gb625d7b

[X2Go dev team]

The branch, master has been updated
       via  b625d7b3c3bcc55d632360377424a0101765abb6 (commit)
      from  84027cfd24dfdbba3b1eb602728a3baf6cd810df (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 b625d7b3c3bcc55d632360377424a0101765abb6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jun 28 19:24:38 2012 +0200

    Create $TMP and $TEMP on x2gostartagent execution if it does not exist. Launch x2goagent with $TEMP=/tmp, otherwise it will fail.

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

Summary of changes:
 debian/changelog              |    4 ++--
 x2goserver/bin/x2gostartagent |    7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index c63260f..e097f89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,8 @@ x2goserver (3.1.1.2-0~x2go1) UNRELEASED; urgency=low
       session.
     - Fix crashes of x2gocleansessions due to faulty syslog calls.
     - Drop redundant hostname calls in x2gocleansessions.
-    - Create $TMP on x2gostartagent execution if it does not exist.
-      Otherwise x2goagent will fail to launch.
+    - Create $TMP and $TEMP on x2gostartagent execution if it does not exist.
+    - Launch x2goagent with $TEMP=/tmp, otherwise it will fail.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 26 Jun 2012 09:32:31 +0200
 
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 08bb1b1..763dedd 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -33,7 +33,8 @@ export NX_ROOT=$X2GO_ROOT
 REMOTE=localhost
 
 # make sure the user's temporary directory exists...
-test -d "$TMP"  || mkdir -p "$TMP"
+test -n "$TMP" && test -d "$TMP"  || mkdir -p "$TMP"
+test -n "$TEMP" && test -d "$TEMP"  || mkdir -p "$TEMP"
 
 X2GO_CLIENT=`echo "$SSH_CLIENT" | awk '{print $1}'`
 $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "client announced itself as ,,$X2GO_CLIENT''"
@@ -258,9 +259,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_LOG}" &
+	TEMP=/tmp 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_LOG}" &
+	TEMP=/tmp 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=$!


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