[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.1-11-g2ca1e9e

[X2Go dev team]

The branch, master has been updated
       via  2ca1e9eb6500ebceb0a37df33bbd785bc7b91f1b (commit)
       via  00a58a2e62e849fa85e2a996957bdd6a371c17d4 (commit)
      from  b625d7b3c3bcc55d632360377424a0101765abb6 (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 2ca1e9eb6500ebceb0a37df33bbd785bc7b91f1b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jun 28 22:15:12 2012 +0200

    Launch x2goagent with $NX_TEMP=/tmp, otherwise it will fail to create the X11 Unix domain sockets.

commit 00a58a2e62e849fa85e2a996957bdd6a371c17d4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jun 28 22:11:32 2012 +0200

    it should be none of our business to create TMP directory

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index e097f89..4860dac 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 and $TEMP on x2gostartagent execution if it does not exist.
-    - Launch x2goagent with $TEMP=/tmp, otherwise it will fail.
+    - Launch x2goagent with $NX_TEMP=/tmp, otherwise it will fail to
+      create the X11 Unix domain sockets.
 
  -- 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 763dedd..fedd6ba 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -32,10 +32,6 @@ export NX_ROOT=$X2GO_ROOT
 
 REMOTE=localhost
 
-# make sure the user's temporary directory exists...
-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''"
 
@@ -259,9 +255,11 @@ x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSI
 SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}"
 
 if  [ "$X2GO_STYPE" == "S" ]; then
-	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}" &
+	# set NX_TEMP to /tmp, make sure x2goagent starts when pam_tmpdir.so is in use
+	NX_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
-	TEMP=/tmp x2goagent -nolisten tcp $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}"  "${NX_AGENT}" 2>"${SESSION_LOG}" &
+	# set NX_TEMP to /tmp, make sure x2goagent starts when pam_tmpdir.so is in use
+	NX_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).