This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 8f25d94 Use File::Which to detect if sshfs command is available before trying to mount a client-side folder. new b4462cb Fix TeKi storing Telekinesis ports in PgSQL-based session DB. Allow negative port numbers for the case that Telekinesis is not installed. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: X2Go/Server/DB/PostgreSQL.pm | 8 ++++---- debian/changelog | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit b4462cb22036335879df1ee0cfe5f772c98d5efa Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Oct 7 16:05:32 2014 +0200 Fix TeKi storing Telekinesis ports in PgSQL-based session DB. Allow negative port numbers for the case that Telekinesis is not installed. --- X2Go/Server/DB/PostgreSQL.pm | 8 ++++---- debian/changelog | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/X2Go/Server/DB/PostgreSQL.pm b/X2Go/Server/DB/PostgreSQL.pm index d99b9a4..aa36489 100644 --- a/X2Go/Server/DB/PostgreSQL.pm +++ b/X2Go/Server/DB/PostgreSQL.pm @@ -320,9 +320,9 @@ sub db_createsession my $sth; if ($with_TeKi) { my $tekictrl_port=shift or die"argument \"tekictrl_port\" missed"; - $tekictrl_port = sanitizer('num', $tekictrl_port) or die "argument \"tekictrl_port\" malformed"; + $tekictrl_port = sanitizer('pnnum', $tekictrl_port) or die "argument \"tekictrl_port\" malformed"; my $tekidata_port=shift or die"argument \"tekidata_port\" missed"; - $tekidata_port = sanitizer('num', $tekidata_port) or die "argument \"tekidata_port\" malformed"; + $tekidata_port = sanitizer('pnnum', $tekidata_port) or die "argument \"tekidata_port\" malformed"; $sth=$dbh->prepare("update sessions_view set status='R',last_time=now(), cookie='$cookie',agent_pid='$pid',client='$client',gr_port='$gr_port', sound_port='$snd_port',fs_port='$fs_port',tekictrl_port='$tekictrl_port', @@ -383,9 +383,9 @@ sub db_resume my $sth; if ($with_TeKi) { my $tekictrl_port=shift or die"argument \"tekictrl_port\" missed"; - $tekictrl_port = sanitizer('num', $tekictrl_port) or die "argument \"tekictrl_port\" malformed"; + $tekictrl_port = sanitizer('pnnum', $tekictrl_port) or die "argument \"tekictrl_port\" malformed"; my $tekidata_port=shift or die"argument \"tekidata_port\" missed"; - $tekidata_port = sanitizer('num', $tekidata_port) or die "argument \"tekidata_port\" malformed"; + $tekidata_port = sanitizer('pnnum', $tekidata_port) or die "argument \"tekidata_port\" malformed"; $sth=$dbh->prepare("update sessions_view set last_time=now(),status='R',client='$client',gr_port='$gr_port', sound_port='$snd_port',fs_port='$fs_port',tekictrl_port='$tekictrl_port', tekidata_port='$tekidata_port' where session_id = '$sid'"); diff --git a/debian/changelog b/debian/changelog index 4e11960..527a074 100644 --- a/debian/changelog +++ b/debian/changelog @@ -54,6 +54,8 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low Make sure the session ID comes first and we have only optional parameters towards the end of the paramter array. - Fix accessing ARGV in X2Go::Utils:check_x2go_sessionid sub. (Fixes: #575). + - Fix TeKi storing Telekinesis ports in PgSQL-based session DB. Allow negative + port numbers for the case that Telekinesis is not installed. * debian/control: + Package X2Go::Log in separate package: libx2go-log-perl. + Package X2Go::Server::DB in separate package: libx2go-server-db-perl. -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org