[X2Go-Commits] [x2goserver] 01/01: Move X2Go Desktop Sharing options around. Make sure all desktop sharing relevant options are provided at the beginning when evoking the "x2godesktopsharing client" command.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit cfb21bede0d00de54cfe89259fcebab79a06563a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Nov 1 08:13:01 2014 +0100

    Move X2Go Desktop Sharing options around. Make sure all desktop sharing relevant options are provided at the beginning when evoking the "x2godesktopsharing client" command.
    
    Conflicts:
    	x2goserver/bin/x2gostartagent
---
 debian/changelog              |    3 +++
 x2goserver/bin/x2gostartagent |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3530e88..3331693 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -168,6 +168,9 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium
     - Fix missing session list output if state file does not exist on the machine
       that runs x2golistsessions(_root).
     - Accept more verbose "DENY" output from x2godesktopsharing.
+    - Move X2Go Desktop Sharing options around. Make sure all desktop sharing
+      relevant options are provided at the beginning when evoking the
+      "x2godesktopsharing client" command.
   * debian/control:
     + Add D (x2goserver): libfile-which-perl.
   * x2goserver.spec:
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index cf2c373..b021b31 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -101,8 +101,8 @@ if [ "$X2GO_STYPE" == "S" ]; then
 	if [ "$SHADOW_USER" != "$USER" ]; then
 
 		$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "user ,,$USER'' requests desktop sharing from user ,,$SHADOW_USER'' for desktop ,,$SHADOW_DESKTOP''"
-		$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing command: x2godesktopsharing client $X2GO_CLIENT $X2GO_GEOMETRY $X2GO_LINK $X2GO_PACK $X2GO_TYPE $X2GO_KBD_LAYOUT $X2GO_KBD_TYPE $X2GO_SET_KBD $X2GO_STYPE $X2GO_CMD $USER"
-		OUTPUT=`x2godesktopsharing client "$X2GO_CLIENT" "$X2GO_GEOMETRY" "$X2GO_LINK" "$X2GO_PACK" "$X2GO_TYPE" "$X2GO_KBD_LAYOUT" "$X2GO_KBD_TYPE" "$X2GO_SET_KBD" "$X2GO_STYPE" "$X2GO_CMD" "$USER"`
+		$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing command: x2godesktopsharing client $USER $X2GO_CLIENT $X2GO_GEOMETRY $X2GO_LINK $X2GO_PACK $X2GO_TYPE $X2GO_KBD_LAYOUT $X2GO_KBD_TYPE $X2GO_SET_KBD $X2GO_STYPE $X2GO_CMD"
+		OUTPUT=`x2godesktopsharing client "$USER" "$X2GO_CLIENT" "$X2GO_GEOMETRY" "$X2GO_LINK" "$X2GO_PACK" "$X2GO_TYPE" "$X2GO_KBD_LAYOUT" "$X2GO_KBD_TYPE" "$X2GO_SET_KBD" "$X2GO_STYPE" "$X2GO_CMD"`
 		OUTPUT=`echo $OUTPUT | sed -e 's/#012/ /g'`
 		$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "command result is: $OUTPUT"
 		if [ "${OUTPUT:0:4}" == "DENY" ]; then

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git