[X2Go-Commits] [x2goserver] 01/08: Fix accessing ARGV in X2Go::Utils:check_x2go_sessionid sub. (Fixes: #575).
git-admin at x2go.org
git-admin at x2go.org
Wed Aug 20 10:18:35 CEST 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goserver.
commit 1f58e7ca6fed9c9638fbbe523d023362f83653e3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Aug 20 10:10:48 2014 +0200
Fix accessing ARGV in X2Go::Utils:check_x2go_sessionid sub. (Fixes: #575).
---
X2Go/Utils.pm | 4 ++--
debian/changelog | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/X2Go/Utils.pm b/X2Go/Utils.pm
index e1e119f..32f106f 100644
--- a/X2Go/Utils.pm
+++ b/X2Go/Utils.pm
@@ -171,8 +171,8 @@ sub system_capture_merged_output {
}
sub check_x2go_sessionid {
- if (sanitizer("x2gosid", at ARGV[0])) {
- return sanitizer("x2gosid", at ARGV[0]);
+ if (sanitizer("x2gosid",$ARGV[0])) {
+ return sanitizer("x2gosid",$ARGV[0]);
} elsif (sanitizer("x2gosid",$ENV{'X2GO_SESSION'})) {
return sanitizer("x2gosid",$ENV{'X2GO_SESSION'});
} else {
diff --git a/debian/changelog b/debian/changelog
index b606fc6..ddac1cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -53,6 +53,7 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low
- Re-arrange parameter order of x2gocreatesession and related DB functions.
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).
* 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
More information about the x2go-commits
mailing list