This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gobroker. from 544c16b fix for last commit new 9e41507 fix for the last two commits new 7daedb7 x2gobroker-agent.pl: Fix detection of X2Go's library path (x2gopath lib). The 2 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: debian/changelog | 1 + lib/x2gobroker-agent.pl | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 9e41507911d92f651b2f98bdcb5f1e83e68b97ec Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Apr 7 18:16:06 2015 +0200 fix for the last two commits --- lib/x2gobroker-agent.pl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl index a23d3cb..5c90282 100755 --- a/lib/x2gobroker-agent.pl +++ b/lib/x2gobroker-agent.pl @@ -26,11 +26,12 @@ use File::Which; use POSIX; # are we running via SSH's ForceCommand? -if ($ENV{"SSH_ORIGINAL_COMMAND"} =~ m/\/usr\/.*\/x2go\/x2gobroker-agent\ .*/ ) { +if ($ENV{"SSH_ORIGINAL_COMMAND"} =~ m/.*\/usr\/.*\/x2go\/x2gobroker-agent\ .*/ ) { my $ssh_original_command = $ENV{'SSH_ORIGINAL_COMMAND'}; - $ssh_original_command =~ s/.*\'(\/usr\/.*\/x2go\/x2gobroker-agent.*)\'/\1/; - @ARGV = split / /, $ssh_original_command; - @ARGV = @ARGV[1..$#ARGV]; + my $ssh_original_command = (split(/;/, $ssh_original_command))[0]; + $ssh_original_command =~ s/^sh -c (\/usr\/.*\/x2go\/x2gobroker-agent\ .*)/\1/; + delete $ENV{"SSH_ORIGINAL_COMMAND"}; + exit(system($ssh_original_command)); } my $username=shift or die; -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 7daedb7fbca65b868facdf6721b84c8320e6a900 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Apr 7 18:45:35 2015 +0200 x2gobroker-agent.pl: Fix detection of X2Go's library path (x2gopath lib). --- debian/changelog | 1 + lib/x2gobroker-agent.pl | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5fdac86..61bc3c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -318,6 +318,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low - When the x2gobroker-agent command call is shipped via $SSH_ORIGINAL_COMMAND environment var, make sure to strip-off "sh -c" from the command's beginning. + - x2gobroker-agent.pl: Fix detection of X2Go's library path (x2gopath lib). * debian/control: + Provide separate bin:package for SSH brokerage: x2gobroker-ssh. + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl index 5c90282..708ceca 100755 --- a/lib/x2gobroker-agent.pl +++ b/lib/x2gobroker-agent.pl @@ -354,7 +354,8 @@ if( $mode eq 'suspendsession' && which('x2gosuspend-session') ) InitX2GoUser($uid, $uidNumber, $gidNumber, $home); print "OK\n"; my $sid=shift; - exec ("sudo", "-u", "$uid", "--", "$(x2gopath lib)/x2gochangestatus", "S", "$sid"); + my $x2go_lib_path=`x2gopath lib`; + exec ("sudo", "-u", "$uid", "--", "$x2go_lib_path/x2gochangestatus", "S", "$sid"); } # use x2goterminate-session to test if we can really do this... @@ -363,5 +364,6 @@ if( $mode eq 'terminatesession' && which('x2goterminate-session') ) InitX2GoUser($uid, $uidNumber, $gidNumber, $home); print "OK\n"; my $sid=shift; - exec ("sudo", "-u", "$uid", "--", "$(x2gopath lib)/x2gochangestatus", "T", "$sid"); + my $x2go_lib_path=`x2gopath lib`; + exec ("sudo", "-u", "$uid", "--", "$x2go_lib_path/x2gochangestatus", "T", "$sid"); } -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
-
git-admin＠x2go.org