[X2Go-Commits] [live-build-x2go] 161/167: added '@' as allowed character in broker URL, sessionselect, and LDAP parameters

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/openbox-magic-pixel-workaround
in repository live-build-x2go.

commit bd7a9e7051daa26656b61b9542f1f65158ab1071
Author: Stefan Baur <kontakt at baur-itcs.de>
Date:   Thu Nov 9 09:14:54 2017 +0100

    added '@' as allowed character in broker URL, sessionselect, and LDAP parameters
---
 .../includes.chroot/lib/live/config/2900-x2go-thinclientconfig | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
index 5344fe2..841ff9a 100755
--- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
+++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
@@ -91,22 +91,22 @@ xsetroot -solid "#246ed8"
 # Get X2GoConfig
 BROKERURL=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' /proc/cmdline | \
 	     awk -F'=' ' /^broker-url=/ { print \$2 }' | \
-	     tr -dc 'a-zA-Z0-9.:/?%_\-')
+	     tr -dc 'a-zA-Z0-9.:/?%_\-@')
 SESSIONSELECT=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' /proc/cmdline | \
 	         awk -F'=' ' /^session=/ { print \$2 }' | \
-	         tr -dc 'a-zA-Z0-9.:/ _\-')
+	         tr -dc 'a-zA-Z0-9.:/ _\-@')
 LDAP=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' /proc/cmdline | \
 	sed 's/^ldap=/ldap#/' | \
 	awk -F'#' ' /^ldap#/ { print \$2 }' | \
-	tr -dc 'a-zA-Z0-9.:_\-')
+	tr -dc 'a-zA-Z0-9.:_\-@')
 LDAP1=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' /proc/cmdline | \
 	 sed 's/^ldap1=/ldap1#/' | \
 	 awk -F'#' ' /^ldap1#/ { print \$2 }' | \
-	 tr -dc 'a-zA-Z0-9.:_\-')
+	 tr -dc 'a-zA-Z0-9.:_\-@')
 LDAP2=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' /proc/cmdline | \
 	 sed 's/^ldap2=/ldap2#/' | \
 	 awk -F'#' ' /^ldap2#/ { print \$2 }' | \
-	 tr -dc 'a-zA-Z0-9.:_\-')
+	 tr -dc 'a-zA-Z0-9.:_\-@')
 
 
 # Check for background and branding SVGs

--
Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git