[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-151-gc66561b

[X2Go dev team]

The branch, master has been updated
       via  c66561b7f609220f2d39cfb240e294246d3016e1 (commit)
      from  7b6b8c72794d71a92bee5cea1ab301afddfe6782 (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 c66561b7f609220f2d39cfb240e294246d3016e1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue May 14 12:23:01 2013 +0200

    Revert "changelog update: add closure for issue #200"
    
    This reverts commit 7b6b8c72794d71a92bee5cea1ab301afddfe6782.

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index e30e866..825de8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -63,7 +63,7 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low
   [ Mike Gabriel ]
   * New upstream version (4.0.0.2):
     - Use make_path from File::Path in x2godbadmin to create user directory if
-      not present. (Fixes: #200).
+      not present.
   /debian/control:
     + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes:
       #163).
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 5569116..5b97fb4 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -135,7 +135,8 @@ USED_DISPLAYS=`$X2GO_LIB_PATH/x2gogetdisplays $HOSTNAME`
 
 #Get all used in system ports from X2Go database and ss output
 ss=$(PATH="$PATH:/usr/sbin:/sbin" type -P ss);
-USED_NONSSH_PORTS=$(
+USED_PORTS=$(
+	"$X2GO_LIB_PATH/x2gogetports" "$HOSTNAME";
 	"$ss" -lnt |
 	perl -lne 'print$d{$2}="|$2|"if/^(\S+\s+){2}\S+:(\d+)/&&!exists$d{$2}';
 );
@@ -143,12 +144,12 @@ USED_NONSSH_PORTS=$(
 while [ "$OUTPUT"  != "inserted" ]; do
 	X2GO_PORT=$(($X2GO_PORT + 1))
 	X2GO_PORT=`echo "for(\\$i=$X2GO_PORT;\\$br ne \"true\";\\$i++){ if(\"$USED_DISPLAYS\" =~ m/\\|\\$i\\|/){\\$br=\"false\";}else{\\$br=\"true\";print \\$i;}}"|perl`
-
+	
 	#Test if the session is already in use. nxagent uses 6000+DISPLAY to open a port. Therefore this must be tested, too.
 	NX_PORT=$(($X2GO_PORT + 6000))
 	if  [ -e "/tmp/.X${X2GO_PORT}-lock" ] ||
 		[ -e "/tmp/.X11-unix/X${X2GO_PORT}" ] || 
-		grep -q "|${NX_PORT}|" <<<$USED_NONSSH_PORTS ; then
+		grep -q "|${NX_PORT}|" <<<$USED_PORTS ; then
 		OUTPUT="XXX"
 	else
 		SESSION_NAME="${USER}-${X2GO_PORT}-`date +\"%s\"`"
@@ -163,7 +164,6 @@ done
 
 while [ "$GR_PORT" == "" ] || [ "$SOUND_PORT" == "" ] || [ "$FS_PORT" == "" ]; do
 	OUTPUT=""
-	USED_PORTS=`echo -e "$($X2GO_LIB_PATH/x2gogetports \"$HOSTNAME\")\n$USED_NONSSH_PORTS"`
 	while [ "$OUTPUT"  != "inserted" ]; do
 		SSH_PORT=$(($SSH_PORT + 1))
 
@@ -209,6 +209,7 @@ mkdir -p $(dirname "${SESSION_LOG}")
 chmod -f 0700 $(dirname "${SESSION_LOG}")
 touch "${SESSION_LOG}"
 chmod -f 0600 "${SESSION_LOG}"
+ln -s "${SESSION_DIR}/session.log" "${SESSION_LOG}"
 
 if [ ! -d "$X2GO_ROOT" ]; then
 	mkdir "$X2GO_ROOT"
@@ -276,9 +277,6 @@ else
 	NX_TEMP=/tmp x2goagent $X2GO_NXAGENT_OPTIONS $NOLISTOPT $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}"  "${NX_AGENT}" 2>"${SESSION_LOG}" &
 fi
 
-# link the session.log on /tmp into the session directory
-ln -s "${SESSION_LOG}" "${SESSION_DIR}/session.log"
-
 X2GO_AGENT_PID=$!
 X2GO_AGENT_RETVAL=$?
 test $X2GO_AGENT_RETVAL && {


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