[X2Go-Commits] x2goserver.git - build-main (branch) updated: 3.0.99.10-19-g4f8e5f0

[X2Go dev team]

The branch, build-main has been updated
       via  4f8e5f05cf758b6b7d98cc563da553b05b443cd2 (commit)
      from  b1536548a685d8fc96640a42fdea53e5281a9072 (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              |    1 +
 x2goserver/bin/x2gostartagent |    8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 1a350d9..22466d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low
     - Fix removal of desktop link on x2goumount-session if local folder of a
       Windows client gets unmounted.
     - Remove redundant -S option from x2goagent start-up command line.
+    - Use -f $XAUTHORITY with xauth calls.
 
   [ Sören Plönnigs ]
   * New upstream version (3.1.0.0):
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 2dbaf0a..fe1ccee 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -78,8 +78,8 @@ if [ "$X2GO_STYPE" == "S" ]; then
 		X2GO_COOKIE=`echo $OUTPUT | awk '{print $2}'`
 		X2GO_PORT=`echo $OUTPUT | awk '{print $1}'`
 		$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "received shadow session information: cookie: $X2GO_COOKIE, port: $X2GO_PORT"
-		xauth add ${HOSTNAME}/unix:${X2GO_PORT} MIT-MAGIC-COOKIE-1 ${X2GO_COOKIE}
-		xauth add ${HOSTNAME}:${X2GO_PORT} MIT-MAGIC-COOKIE-1 ${X2GO_COOKIE}
+		xauth -f $XAUTHORITY add ${HOSTNAME}/unix:${X2GO_PORT} MIT-MAGIC-COOKIE-1 ${X2GO_COOKIE}
+		xauth -f $XAUTHORITY add ${HOSTNAME}:${X2GO_PORT} MIT-MAGIC-COOKIE-1 ${X2GO_COOKIE}
 
 		echo $X2GO_PORT
 		echo $X2GO_COOKIE
@@ -204,8 +204,8 @@ PATH="${PATH}:${X2GO_BIN}/"
 export PATH
 
 
-xauth add ${HOSTNAME}/unix:${X2GO_PORT} MIT-MAGIC-COOKIE-1 ${X2GO_COOKIE}
-xauth add ${HOSTNAME}:${X2GO_PORT} MIT-MAGIC-COOKIE-1 ${X2GO_COOKIE}
+xauth -f $XAUTHORITY add ${HOSTNAME}/unix:${X2GO_PORT} MIT-MAGIC-COOKIE-1 ${X2GO_COOKIE}
+xauth -f $XAUTHORITY add ${HOSTNAME}:${X2GO_PORT} MIT-MAGIC-COOKIE-1 ${X2GO_COOKIE}
 
 
 if [ "$X2GO_SET_KBD" == "0" ]


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