[X2Go-Commits] x2goserver.git - build-main (branch) updated: 3.1.1.3-12-gdf4c17c

X2Go dev team git-admin at x2go.org
Wed Dec 4 06:18:23 CET 2013


The branch, build-main has been updated
       via  df4c17c9ef5337a453323b0f933039a4b8cac9a5 (commit)
      from  0c3542c4b6710d97ad11f182e0ec8c0f5198b9e4 (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              |    3 +++
 x2goserver/bin/x2gostartagent |    6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 462dee4..740b935 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ x2goserver (3.1.1.4-0~x2go1) UNRELEASED; urgency=low
     + Fix x2goagent dependency.
     + Add rdesktop and pulseaudio-utils to Suggests.
 
+  [ Oleksandr Shneyder ]
+  * remove "-nolisten tcp" option with XDMCP sessions
+
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 03 Jul 2012 10:03:28 +0200
 
 x2goserver (3.1.1.3-0~x2go1) unstable; urgency=low
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index abf1422..c049566 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -247,8 +247,10 @@ else
 	X2GODPIOPTION_="-dpi $X2GODPI"
 fi
 
+NOLISTOPT=""
 if [ "$X2GOXDMCP" == "" ] ;then
 	XDMCPOPT=""
+	NOLISTOPT="-nolisten tcp"
 else
 	XDMCPOPT="-query $X2GOXDMCP"
 fi
@@ -260,10 +262,10 @@ SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}"
 
 if  [ "$X2GO_STYPE" == "S" ]; then
 	# set NX_TEMP to /tmp, make sure x2goagent starts when pam_tmpdir.so is in use
-	NX_TEMP=/tmp 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_LOG}" &
+	NX_TEMP=/tmp x2goagent $NOLISTOPT $X2GODPIOPTION_ -$SESSION_TYPE -auth "$XAUTHORITY" -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}"  "${NX_AGENT}" 2>"${SESSION_LOG}" &
 else
 	# set NX_TEMP to /tmp, make sure x2goagent starts when pam_tmpdir.so is in use
-	NX_TEMP=/tmp x2goagent -nolisten tcp $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}"  "${NX_AGENT}" 2>"${SESSION_LOG}" &
+	NX_TEMP=/tmp x2goagent $NOLISTOPT $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}"  "${NX_AGENT}" 2>"${SESSION_LOG}" &
 fi
 
 X2GO_AGENT_PID=$!


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




More information about the x2go-commits mailing list