[X2Go-Commits] [x2goserver] 01/02: Allow length of username up to 48 characters (was: 32 characters). (Fixes: #574).

[git-admin at x2go.org]

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 49c4a84c918934919169e2f54bf5b71b70bb89b2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Aug 20 10:06:48 2014 +0200

    Allow length of username up to 48 characters (was: 32 characters). (Fixes: #574).
---
 debian/changelog            |    2 ++
 x2goserver/lib/x2goutils.pm |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e04c640..78f55b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -67,6 +67,8 @@ x2goserver (4.0.1.16-0x2go1) UNRELEASED; urgency=low
     - Allow email addresses as login usernames. (Fixes: #573).
     - Abort session startup if env var $USER or $SSH_CLIENT are not set.
       (Fixes: #558).
+    - Allow length of username up to 48 characters (was: 32 characters). (Fixes:
+      #574).
   * 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/lib/x2goutils.pm b/x2goserver/lib/x2goutils.pm
index b2f5072..13957c0 100644
--- a/x2goserver/lib/x2goutils.pm
+++ b/x2goserver/lib/x2goutils.pm
@@ -49,8 +49,8 @@ sub sanitizer {
 		$string =~ s/[^a-zA-Z0-9\_\-\$\.\@]//g;
 		if ($string =~ /^([a-zA-Z0-9\_\-\$\.\@]*)$/) {
 			$string = $1;
-			if ($string =~ /^([a-zA-Z\_][a-zA-Z0-9\_\-\.\@]{0,31}[\$]?)\-([\d]{2,4})\-([\d]{9,12})\_[a-zA-Z0-9\_\-]*\_dp[\d]{1,2}$/) {
-				if ((length($1) > 0) and (length($1) < 32)){
+			if ($string =~ /^([a-zA-Z\_][a-zA-Z0-9\_\-\.\@]{0,47}[\$]?)\-([\d]{2,4})\-([\d]{9,12})\_[a-zA-Z0-9\_\-]*\_dp[\d]{1,2}$/) {
+				if ((length($1) > 0) and (length($1) < 48)){
 					return $string;
 				} else {return 0;}
 			} else {return 0;}

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