[X2Go-Commits] [x2goserver] 01/05: X2Go_in_progress_do_not_use/Server/DB/MySQL.pm: backport kdrive change.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2goserver.

commit 568f27a33b802a664e9189cf277265cbacabd84e
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Jun 16 21:30:43 2019 +0200

    X2Go_in_progress_do_not_use/Server/DB/MySQL.pm: backport kdrive change.
---
 X2Go_in_progress_do_not_use/Server/DB/MySQL.pm | 2 +-
 debian/changelog                               | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/X2Go_in_progress_do_not_use/Server/DB/MySQL.pm b/X2Go_in_progress_do_not_use/Server/DB/MySQL.pm
index a06b437..3870172 100644
--- a/X2Go_in_progress_do_not_use/Server/DB/MySQL.pm
+++ b/X2Go_in_progress_do_not_use/Server/DB/MySQL.pm
@@ -129,7 +129,7 @@ sub validate_session_id
 	$uname_ =~ s/\\//;
 
 	# perform the user check
-	$user =~ s/($uname_-[0-9]{2,}-[0-9]{10,}_st(D|R).*|.*-[0-9]{2,}-[0-9]{10,}_stS(0|1)XSHAD$uname_.*)/$uname_/;
+	$user =~ s/($uname_-[0-9]{2,}-[0-9]{10,}_st(D|R|K).*|.*-[0-9]{2,}-[0-9]{10,}_stS(0|1)XSHAD$uname_.*)/$uname_/;
 	die "$uname_ is not authorized to perform this operation" unless ($uname_ eq $user);
 }
 
diff --git a/debian/changelog b/debian/changelog
index 4e325cf..d12c16e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -81,6 +81,7 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium
     - x2goserver/Makefile: don't quote POD_SCRIPTS, because of... make.
     - x2goserver/Makefile: install man1 files and dirs, too.
     - x2goserver/bin/x2goruncommand: fix typo in IceWM branch.
+    - X2Go_in_progress_do_not_use/Server/DB/MySQL.pm: backport kdrive change.
   * debian/control:
     + Build-depend upon lsb-release for distro version detection.
   * debian/x2goserver.manpages:

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git