[X2Go-Commits] [x2goserver] 01/01: Abort session if env var $HOME is not set or if $HOME contains non-ASCII characters. (Fixes: #397).

git-admin at x2go.org git-admin at x2go.org
Wed Aug 20 10:55:17 CEST 2014


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

x2go pushed a commit to branch release/4.0.1.x
in repository x2goserver.

commit a2e9b6dbea53d598f007b5550cde6937ab6907dd
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Aug 20 10:55:04 2014 +0200

    Abort session if env var $HOME is not set or if $HOME contains non-ASCII characters. (Fixes: #397).
---
 debian/changelog              |    2 ++
 x2goserver/bin/x2gostartagent |    6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ea150c3..fdf038c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -69,6 +69,8 @@ x2goserver (4.0.1.16-0x2go1) UNRELEASED; urgency=low
       (Fixes: #558).
     - Allow length of username up to 48 characters (was: 32 characters). (Fixes:
       #574).
+    - Abort session if env var $HOME is not set or if $HOME contains non-ASCII
+      characters. (Fixes: #397).
   * debian/control, x2goserver.spec:
     + Update versioned D: x2goagent (>= 3.5.0.25). This assures that X2Go
       works with poly-instantiated /tmp directories.
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 1e9de90..00f3834 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -37,6 +37,12 @@ elif [ -z "$USER" ]; then
 elif [ -z "$SSH_CLIENT" ]; then
 	echo "The \$SSH_CLIENT environment variable is not set. Aborting session startup."
 	exit -3
+elif [ -z "$HOME" ]; then
+	echo "The \$HOME environment variable is not set. Aborting session startup."
+	exit -4
+elif ! echo $HOME | iconv -f ASCII -t ASCII 1>/dev/null 2>/dev/null; then
+	echo "Your home directory path contains non-ASCII characters. Aborting session startup."
+	exit -5
 fi
 
 X2GO_ROOT="${HOME}/.x2go"

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


More information about the x2go-commits mailing list