[X2Go-Commits] [x2gobroker] 02/03: broker agent: avoid one option system() calls in Perl.

git-admin at x2go.org git-admin at x2go.org
Wed Mar 19 01:14:43 CET 2014


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit d85a8799817c6ba5c8c58a488c9f53eb72c8a60c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Mar 19 01:14:27 2014 +0100

    broker agent: avoid one option system() calls in Perl.
---
 lib/x2gobroker-agent.pl |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl
index ee359bf..02a4b33 100755
--- a/lib/x2gobroker-agent.pl
+++ b/lib/x2gobroker-agent.pl
@@ -80,12 +80,12 @@ sub AddAuthKey
 	}
 
 	# make sure dir and file for authorized_keys do exist
-	system ("su - $uid -c \"mkdir -p $authkeydir\"");
-	system ("su - $uid -c \"touch $authkeyfile\"");
-	my $authorized_keys = `su - $uid -c \"cat $authkeyfile\"`;
+	system ("sudo", "-u", "$uid", "--", "mkdir", "-p", "$authkeydir");
+	system ("sudo", "-u", "$uid", "--", "touch", "$authkeyfile");
+	my $authorized_keys = `sudo -u $uid -- "cat $authkeyfile"`;
 	if ( ! ( $authorized_keys =~ m/$pubkey/ ) )
 	{
-		system("su - $uid -c \"echo $pubkey >> $authkeyfile\"");
+		system("sudo", "-u", "$uid", "--", "echo $pubkey >> $authkeyfile");
 	}
 }
 
@@ -101,7 +101,7 @@ sub DelAuthKey
 	{
 		$authkeyfile = "$home/$authkeyfile";
 	}
-	system("su - $uid -c \"sed -e s\!'$pubkey'\!''\! -e '/^\$/d' -i $authkeyfile\" 1>/dev/null 2>/dev/null");
+	system("sudo", "-u", "$uid", "--", "sed -e s\!'$pubkey'\!''\! -e '/^\$/d' -i $authkeyfile 1>/dev/null 2>/dev/null");
 }
 
 $< = $>;
@@ -138,7 +138,7 @@ if($mode eq 'listsessions')
 {
 	InitX2GoUser($uid, $uidNumber, $gidNumber, $home);
 	print "OK\n";
-	exec ("/bin/su - $uid -c \"x2golistsessions --all-servers\"");
+	system("sudo", "-u", "$uid", "--", "x2golistsessions", "--all-servers");
 }
 
 if( ($mode eq 'findbusyservers_by_sessionstats') || ($mode eq 'findbusyservers'))
@@ -164,7 +164,7 @@ if( ($mode eq 'findbusyservers_by_sessionstats') || ($mode eq 'findbusyservers')
 
 	InitX2GoUser($uid, $uidNumber, $gidNumber, $home);
 	print "OK\n";
-	my $busy_servers = `/bin/su - $uid -c \"x2gogetservers\"`;
+	my $busy_servers = `sudo -u $uid -c \"x2gogetservers\"`;
 
 	my %server_load = ();
 	my $num_sessions = 0;
@@ -190,7 +190,7 @@ if($mode eq 'getservers')
 {
 	InitX2GoUser($uid, $uidNumber, $gidNumber, $home);
 	print "OK\n";
-	exec ("/bin/su - $uid -c \"x2gogetservers\"");
+	exec ("sudo", "-u", "$uid", "--", "x2gogetservers");
 }
 
 if($mode eq 'addauthkey')
@@ -216,7 +216,7 @@ if($mode eq 'suspendsession')
 	InitX2GoUser($uid, $uidNumber, $gidNumber, $home);
 	print "OK\n";
 	my $sid=shift;
-	exec ("/bin/su - $uid -c \"\$(x2gopath lib)/x2gochangestatus S $sid\"");
+	exec ("sudo", "-u", "$uid", "--", "$(x2gopath lib)/x2gochangestatus", "S",  "$sid");
 }
 
 if($mode eq 'terminatesession')
@@ -224,6 +224,6 @@ if($mode eq 'terminatesession')
 	InitX2GoUser($uid, $uidNumber, $gidNumber, $home);
 	print "OK\n";
 	my $sid=shift;
-	exec ("/bin/su - $uid -c \"\$(x2gopath lib)/x2gochangestatus T $sid\"");
+	exec ("sudo", "-u", "$uid", "--", "$(x2gopath lib)/x2gochangestatus", "T",  "$sid");
 }
 

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git



More information about the x2go-commits mailing list