V Sat, 18 Feb 2012 00:47:38 +0100
Mike Gabriel <[email protected]> napsáno:

Hello Mike,

> Hi Milan,
> 
> On Mi 15 Feb 2012 21:23:56 CET Milan Knížek wrote:
> 
> > The attached patch removes the -f $HOME/.Xauthority parameter from
> > the x2goagent command line to resolve the problem. It also removes a
> > redundant '-S' parameter (there is already $SESSION_TYPE there).
> 
> This part has been committed as is:
> http://code.x2go.org/gitweb?p=x2goserver.git;a=commitdiff;h=c4a1ea405879b07d351b6c10da02bb891c02c45b

Thanks.

> > the /usr/bin/x2gostartagent script does not sufficiently specify the
> > location of $XAUTHORITY file for the xauth command, while the
> > command line for starting x2goagent refers to a specific location
> > $HOME/.Xauthority.
> 
> I have modified your patch slightly, could you test my patch if that  
> works for you???
> http://code.x2go.org/gitweb?p=x2goserver.git;a=commitdiff;h=51771f645ffa60d561e156847dbc79cce6b41d4d

Should we want -xauth parameter for x2goagent (xserver), wouldn't it be
consistent to add the same for xauth commands? (Patch attached.)

P.S. It works for me with the extra patch and also w/o it.

Regards,
Milan
-- 
http://www.milan-knizek.net/
About linux and photography (Czech only)
O linuxu a fotografování
From 36dbaf446ea0457aaf0f4a7e5a02dc5026b0adc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20Kn=C3=AD=C5=BEek?= <[email protected]>
Date: Sun, 19 Feb 2012 16:07:55 +0100
Subject: [PATCH] Add -f $XAUTHORITY to xauth commands in x2gostartagent

---
 x2goserver/bin/x2gostartagent |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

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" ]
-- 
1.7.9.1

Attachment: signature.asc
Description: PGP signature

_______________________________________________
X2Go-Dev mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/x2go-dev

Reply via email to