[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-95-g6543a39

[X2Go dev team]

The branch, master has been updated
       via  6543a391c5932332dbfe82d51a8cd2c3a4f8d62e (commit)
      from  9ae33c2c9546557c6915906627129ef7e9c5c7e2 (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 6543a391c5932332dbfe82d51a8cd2c3a4f8d62e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Nov 23 15:19:23 2012 +0100

    Fix x2godesktopsharing, we had added to many quotation marks in x2gostartagent.
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index e7c6bf8..751c65f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,14 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 03 Jul 2012 10:03:28 +0200
 
+x2goserver (3.1.1.9-0~x2go1) UNRELEASED; urgency=low
+
+  * New upstream release (3.1.1.9):
+    - Fix x2godesktopsharing, we had added to many quotation marks in
+      x2gostartagent.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 23 Nov 2012 12:06:40 +0100
+
 x2goserver (3.1.1.8-0~x2go1) unstable; urgency=low
 
   * New bugfix release (3.1.1.8):
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index c049566..d7a5f1d 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -32,7 +32,7 @@ export NX_ROOT=$X2GO_ROOT
 
 REMOTE=localhost
 
-X2GO_CLIENT=`echo "$SSH_CLIENT" | awk '{print $1}'`
+X2GO_CLIENT=`echo $SSH_CLIENT | awk '{print $1}'`
 $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "client announced itself as ,,$X2GO_CLIENT''"
 
 X2GO_GEOMETRY="$1"; shift
@@ -51,9 +51,9 @@ XAUTHORITY=${XAUTHORITY:-"$HOME/.Xauthority"}
 
 if [ "$X2GO_STYPE" == "S" ]; then
 
-	SHADOW_MODE=`echo "$X2GO_CMD"|awk '{split($0,a,"XSHAD"); print a[1]}'`
-	SHADOW_USER=`echo "$X2GO_CMD"|awk '{split($0,a,"XSHAD"); print a[2]}'`
-	SHADOW_DESKTOP=`echo "$X2GO_CMD"|awk '{split($0,a,"XSHAD"); print a[3]}'`
+	SHADOW_MODE=`echo $X2GO_CMD |awk '{split($0,a,"XSHAD"); print a[1]}'`
+	SHADOW_USER=`echo $X2GO_CMD |awk '{split($0,a,"XSHAD"); print a[2]}'`
+	SHADOW_DESKTOP=`echo $X2GO_CMD |awk '{split($0,a,"XSHAD"); print a[3]}'`
 
 	test -z $1 && { 
 
@@ -77,8 +77,12 @@ if [ "$X2GO_STYPE" == "S" ]; then
 			$X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: user $SHADOW_USER denied desktop sharing session"
 			exit -1
 		fi
-		X2GO_COOKIE=`echo "$OUTPUT" | awk '{print $2}'`
-		X2GO_PORT=`echo "$OUTPUT" | awk '{print $1}'`
+		X2GO_COOKIE=`echo $OUTPUT | awk '{print $2}'`
+		X2GO_PORT=`echo $OUTPUT | awk '{print $1}'
+		echo "=================="
+		echo "X2GO_PORT: $X2GO_PORT"
+`		echo "=================="
+
 		$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "received shadow session information: cookie: $X2GO_COOKIE, port: $X2GO_PORT"
 		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}"
@@ -95,7 +99,7 @@ if [ "$X2GO_STYPE" == "S" ]; then
 fi
 
 LIMIT=`x2gosessionlimit`
-LWORD=`echo "$LIMIT" | awk '{print $1}'`
+LWORD=`echo $LIMIT | awk '{print $1}'`
 
 if [ "$LWORD" == "LIMIT" ]; then
 	echo  $LIMIT 1>&2
@@ -104,7 +108,7 @@ fi
 
 export NX_CLIENT="$X2GO_LIB_PATH/x2gosuspend-agent"
 
-COLORDEPTH=`echo "$X2GO_TYPE"|awk '{split($0,a,"-depth_"); print a[2]}'`
+COLORDEPTH=`echo $X2GO_TYPE | awk '{split($0,a,"-depth_"); print a[2]}'`
 
 SESSION_TYPE="D"
 NOEXITPARAM=""


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