[X2Go-Commits] [x2gobroker] 01/02: fix for the last two commits

git-admin at x2go.org git-admin at x2go.org
Tue Apr 7 18:45:43 CEST 2015


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 at 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


More information about the x2go-commits mailing list