[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99.10-17-g51771f6

[X2go dev team]

The branch, master has been updated
       via  51771f645ffa60d561e156847dbc79cce6b41d4d (commit)
      from  c557ccdfbfac96bfa63e14d522999a20a7b2c57a (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 51771f645ffa60d561e156847dbc79cce6b41d4d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Feb 17 23:38:00 2012 +0100

    Allow other $XAUTHORITY values than the default ($HOME/.Xauthority).

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 39475db..1a350d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,7 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low
     - Provide new package x2goserver-fmbindings. Derived from a package draft
       provided by Milan Knížek (Thanks!).
     - Do not create desktop icons for rootless (i.e. non-desktop) sessions.
+    - Allow other $XAUTHORITY values than the default ($HOME/.Xauthority).
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 01 Feb 2012 13:45:00 +0100
 
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 4951c0b..fa173c5 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -45,6 +45,8 @@ X2GO_CMD=$1; shift
 X2GO_RESIZE=0
 X2GO_FULLSCREEN=0
 
+XAUTHORITY=${XAUTHORITY:-"$HOME/.Xauthority"}
+
 if [ "$X2GO_STYPE" == "S" ]; then
 
 	SHADOW_MODE=`echo "$X2GO_CMD"|awk '{split($0,a,"XSHAD"); print a[1]}'`
@@ -240,9 +242,9 @@ x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSIO
 SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}"
 
 if  [ "$X2GO_STYPE" == "S" ]; then
-	x2goagent $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 $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 &
 else
-	x2goagent $X2GODPIOPTION_ $XDMCPOPT  -$SESSION_TYPE -auth ~/.Xauthority -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}"  ${NX_AGENT} 2>${SESSION_DIR}/session.log &
+	x2goagent $X2GODPIOPTION_ $XDMCPOPT  -$SESSION_TYPE -auth $XAUTHORITY -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}"  ${NX_AGENT} 2>${SESSION_DIR}/session.log &
 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).