This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.0.x in repository x2goserver. commit 1c6a9558bc9cee73a3980d5c4aa5bb5b662834a2 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Jan 20 13:52:44 2014 +0100 Use perl instead of sed for search+replace in session names sanitizing. (Fixes: #404). --- debian/changelog | 4 +++- x2goserver/bin/x2gostartagent | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index f3096ee..62bb4af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ x2goserver (4.0.0.11-0x2go1) UNRELEASED; urgency=low - * Continue development on LTS release branch... + * New upstream version (4.0.0.11): + - Use perl instead of sed for search+replace in session names sanitizing. + (Fixes: #404). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Jan 2014 18:43:03 +0100 diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index cd89f8d..29f83b1 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -155,10 +155,10 @@ while [ "$OUTPUT" != "inserted" ]; do SESSION_NAME="${USER}-${X2GO_PORT}-`date +\"%s\"`" if [ "$COLORDEPTH" != "" ]; then SESSION_NAME="${SESSION_NAME}_st${SESSION_TYPE}${X2GO_CMD}_dp${COLORDEPTH}" - SESSION_NAME=`echo "$SESSION_NAME" | sed -e "s/:/PP/g"` + SESSION_NAME=`echo "$SESSION_NAME" | perl -pe "s/:/PP/g"` fi # sanitize session name - SESSION_NAME=`echo "$SESSION_NAME" | sed -e "s/[^a-zA-Z0-9\.\_\-]//g"` + SESSION_NAME=`echo "$SESSION_NAME" | perl -pe "s/[^a-zA-Z0-9\.\_\-]//g"` OUTPUT=`$X2GO_LIB_PATH/x2goinsertsession "$X2GO_PORT" "$HOSTNAME" "$SESSION_NAME"` fi -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git