x2goserver.git - master (branch) updated: 3.1.1.0-15-g147d22c - x2go-commits

14 May 2012

The branch, master has been updated
       via  147d22c44167b9b2d4afbdaf17262555a7af713b (commit)
      from  ea355064c9a388987117c8765501be55061e47c9 (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 147d22c44167b9b2d4afbdaf17262555a7af713b
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Mon May 14 12:56:29 2012 +0200

    Use ,,-nolisten tcp'' option when evoking x2goagent from within x2gostartagent.

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

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

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index f07404d..967131b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low
       translated into an executable command by x2goruncommand.
     - Detect desktop session mode to use for Ubuntu precise and later.
     - Complete UNITY/GNOME support for Ubuntu/Debian.
+    - Use ,,-nolisten tcp'' option when evoking x2goagent from within
+      x2gostartagent.
 
  -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Wed, 04 Apr 2012 11:44:14 +0200
 
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 739a0c2..29d0302 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -246,9 +246,9 @@ x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSI
 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 -nolisten tcp $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 $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}"  "${NX_AGENT}" 2>"${SESSION_DIR}/session.log" &
+	x2goagent -nolisten tcp $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -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).

    