[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99-2-121-g226086a
X2go dev team
git-admin at x2go.org
Tue Jul 26 07:33:13 CEST 2011
The branch, master has been updated
via 226086a5935aa13fb2e6222c111b5d1182a0fb8a (commit)
from b053c030b22066f5a712e2c4dd25c0be0f7dc256 (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 -----------------------------------------------------------------
commit 226086a5935aa13fb2e6222c111b5d1182a0fb8a
Author: Reinhard Tartler <siretart at tauware.de>
Date: Mon Jul 25 20:56:25 2011 +0200
fix $realuser variable after 6ec99657c4be82fe659cf3d13614be7a9734a380
Obviously, the code assumes that $realuser contains the user name
instead of the userid. This should unbreak for instance the cleanup
daemon after switching from sudo to perlsuid.
-----------------------------------------------------------------------
Summary of changes:
x2goserver/lib/x2gosqlitewrapper.pl | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl
index d598691..de8b5b9 100755
--- a/x2goserver/lib/x2gosqlitewrapper.pl
+++ b/x2goserver/lib/x2gosqlitewrapper.pl
@@ -31,8 +31,8 @@ my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expi
my $dbfile="$homedir/x2go_sessions";
# retrieve account data of real user
-my $realuser=$<;
-my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid($realuser);
+my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid($<);
+my $realuser=$uname;
my $dbh=DBI->connect("dbi:SQLite:dbname=$dbfile","","",{AutoCommit => 1}) or die $_;
@@ -310,7 +310,7 @@ sub check_user
my $sid=shift or die "argument \"session_id\" missed";
# session id looks like someuser-51-1304005895_stDgnome-session_dp24
my ( $user, $rest ) = split('-', $sid, 2);
- $user eq $uname or die "$uname is not authorized (should be $user)";
+ $user eq $realuser or die "$realuser is not authorized (should be $user)";
}
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).
More information about the x2go-commits
mailing list