[X2Go-Commits] x2goserver.git - release/4.0.0.x (branch) updated: 4.0.0.7-9-gdda4b72
X2Go dev team
git-admin at x2go.org
Fri Jan 3 18:00:38 CET 2014
The branch, release/4.0.0.x has been updated
via dda4b72163167025b8112ac0ab216e678240f55e (commit)
from 497a3db764cb4640b548d59a7236afb6af955af4 (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 dda4b72163167025b8112ac0ab216e678240f55e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sun Dec 29 22:34:34 2013 +0100
Avoid backticks in x2goshowblocks, move script to <prefix>/sbin/ as it is for being run with root privileges.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 ++
x2goserver/{bin => sbin}/x2goshowblocks | 7 ++++---
2 files changed, 6 insertions(+), 3 deletions(-)
rename x2goserver/{bin => sbin}/x2goshowblocks (90%)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 1dcfb7e..1f1f964 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ x2goserver (4.0.0.8-0x2go1) UNRELEASED; urgency=low
x2golistsessions_root.
- Avoid one argument system calls and backticks in x2golistsessions.
- Avoid one argument system calls and backticks in x2goprint.
+ - Avoid backticks in x2goshowblocks, move script to <prefix>/sbin/ as it is
+ for being run with root privileges.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Thu, 28 Nov 2013 16:14:32 +0100
diff --git a/x2goserver/bin/x2goshowblocks b/x2goserver/sbin/x2goshowblocks
similarity index 90%
rename from x2goserver/bin/x2goshowblocks
rename to x2goserver/sbin/x2goshowblocks
index 46dd6d0..8cecaad 100755
--- a/x2goserver/bin/x2goshowblocks
+++ b/x2goserver/sbin/x2goshowblocks
@@ -26,6 +26,7 @@ use Sys::Syslog qw( :standard :macros );
use lib `x2gopath lib`;
use x2godbwrapper;
use x2gologlevel;
+use x2goutils;
openlog($0,'cons,pid','user');
setlogmask( LOG_UPTO(x2gologlevel()) );
@@ -40,8 +41,8 @@ my @outp=dbsys_getmounts( $id);
for (my $i=0;$i<@outp;$i++)
{
my $path=(split("\\|", at outp[$i]))[1];
- print `su $uname -c "lsof 2>/dev/null | grep $path"`;
+ print x2goutils::system_capture_merged_output("su", "$uname", "-c", "lsof | grep \"$path\"");
}
-# closing syslog
-closelog;
\ No newline at end of file
+# closing syslog
+closelog;
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