[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.1.1.3-321-g6b219e9
X2Go dev team
git-admin at x2go.org
Fri Jan 3 18:05:26 CET 2014
The branch, build-baikal has been updated
via 6b219e9ca6f76e55df80ba369807c9be831902de (commit)
from 968b9eaefce8f4ea1d3b50d73c1e1b16357dcd05 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 ++
x2goserver/{bin => sbin}/x2goshowblocks | 7 ++++---
2 files changed, 6 insertions(+), 3 deletions(-)
rename x2goserver/{bin => sbin}/x2goshowblocks (89%)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index b3a35c9..823fe95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -262,6 +262,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 89%
rename from x2goserver/bin/x2goshowblocks
rename to x2goserver/sbin/x2goshowblocks
index 79526a3..482f4e6 100755
--- a/x2goserver/bin/x2goshowblocks
+++ b/x2goserver/sbin/x2goshowblocks
@@ -25,6 +25,7 @@ use Sys::Syslog qw( :standard :macros );
use X2Go::Server::DB;
use X2Go::Log qw(loglevel);
+use X2Go::Utils qw(system_capture_merged_output);
openlog($0,'cons,pid','user');
setlogmask( LOG_UPTO(loglevel()) );
@@ -39,8 +40,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 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