[X2Go-Commits] x2goserver.git - release/4.0.1.x (branch) updated: 3.0.99.10-29-ge298bd1

[X2Go dev team]

The branch, release/4.0.1.x has been updated
       via  e298bd19efb2fc0b1e7d1ec256332f8d9871d2fd (commit)
      from  b4684ddfafa899ff10de734b9b0957dcd38909c2 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                    |    1 +
 x2goserver/lib/x2gosqlitewrapper.pl |    5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 56dde28..4c36ff3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,7 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low
       /tmp. Use ENV{'TMP'} instead, unless it is empty. Then use /tmp.
     - Place quotations where appropriate into shell scripts.
     - Fix call to x2goterminate-desktopsharing in x2goruncommand.
+    - Tolerate user names containing "-" characters (SQLite DB backend).
   * Let x2goserver package suggest x2goserver-fmbindings.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 01 Feb 2012 13:45:00 +0100
diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl
index ac8a7c6..2f6512e 100755
--- a/x2goserver/lib/x2gosqlitewrapper.pl
+++ b/x2goserver/lib/x2gosqlitewrapper.pl
@@ -324,8 +324,9 @@ sub check_user
 	my $sid=shift or die "argument \"session_id\" missed";
 	return if $realuser eq "root";
 	# session id looks like someuser-51-1304005895_stDgnome-session_dp24
-	my ( $user, $rest ) = split('-', $sid, 2);
-	$user eq $realuser or die "$realuser is not authorized (should be $user)";
+	my $user = "$sid";
+	$user =~ s/$realuser-[0-9]+-[0-9]+.*/$realuser/;
+	$user eq $realuser or die "$realuser is not authorized";
 }
 
 sub fetchrow_printall_array


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