[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-345-gda9cdd0

[X2Go dev team]

The branch, master has been updated
       via  da9cdd0952510a988d6755a8d682da2c08ec5faa (commit)
      from  2250c18fe510008caa1969ebb54183706c94d53b (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 da9cdd0952510a988d6755a8d682da2c08ec5faa
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jan 6 15:08:20 2014 +0100

    fix for last commit
    
    Conflicts (resolved by Mike Gabriel):
    	x2goserver/bin/x2gostartagent

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

Summary of changes:
 x2goserver/bin/x2gostartagent |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 17beae7..c11aa0c 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -171,9 +171,10 @@ while [ "$OUTPUT"  != "inserted" ]; do
 		if [ "$COLORDEPTH" != "" ]; then
 			SESSION_NAME="${SESSION_NAME}_st${SESSION_TYPE}${X2GO_CMD}_dp${COLORDEPTH}"
 			SESSION_NAME=`echo "$SESSION_NAME" | sed  -e  "s/:/PP/g"`
-			# sanitize session name
-			SESSION_NAME=`echo "$SESSION_NAME" | sed  -e  "s/[^a-zA-Z0-9\_\-\.]//g"`
 		fi
+		# sanitize session name
+		SESSION_NAME=`echo "$SESSION_NAME" | sed  -e  "s/[^a-zA-Z0-9\.\_\-]//g"`
+	
 		if [ -n "$SHADREQ_USER" ]; then
 			$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "initializing new shadow session with ID $SESSION_NAME"
 			OUTPUT=`$X2GO_LIB_PATH/x2goinsertshadowsession "$X2GO_PORT" "$HOSTNAME" "$SESSION_NAME" "$SHADREQ_USER"`


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