[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-343-gd397667

[X2Go dev team]

The branch, master has been updated
       via  d3976677451cb417c2281944c25950700ef4fd19 (commit)
      from  fb8442db527e62ba6317a86309e93c810f5f817e (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 d3976677451cb417c2281944c25950700ef4fd19
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jan 6 12:37:07 2014 +0100

    Sanitize session name in x2gostartagent, as well. Fixes problems with custom session commands containing characters that get sanitized out.
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog

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

Summary of changes:
 debian/changelog              |    9 +++++++++
 x2goserver/bin/x2gostartagent |    2 ++
 2 files changed, 11 insertions(+)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index e7699b1..617565d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -269,6 +269,15 @@ x2goserver (4.0.1.0-0~x2go1) unstable; urgency=low
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 07 Jun 2013 23:07:40 +0200
 
+x2goserver (4.0.0.9-0x2go1) UNRELEASED; urgency=low
+
+  * New upstream version (4.0.0.9):
+    - Sanitize session name in x2gostartagent, as well. Fixes problems
+      with custom session commands containing characters that get
+      sanitized out.
+
+ -- Mike Gabriel <mga at listrac.informatik.uni-kiel.de>  Mon, 06 Jan 2014 12:35:24 +0100
+
 x2goserver (4.0.0.8-0x2go1) unstable; urgency=low
 
   * New upstream version (4.0.0.8):
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index c04ea2c..cd690c1 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -171,6 +171,8 @@ 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
 		if [ -n "$SHADREQ_USER" ]; then
 			$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "initializing new shadow session with ID $SESSION_NAME"


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