[X2Go-Commits] x2goserver.git - release/4.0.1.x (branch) updated: 3.0.99-2-223-g49887e8
X2Go dev team
git-admin at x2go.org
Thu Jun 6 13:34:47 CEST 2013
The branch, release/4.0.1.x has been updated
via 49887e82635ea1b030636cb276152fdd8656cef2 (commit)
from d63a839c23b8f470aa30b32d3b37be66e2d412aa (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 | 1 +
x2goserver/bin/x2golistdesktops | 8 ++++++++
x2goserver/bin/x2golistsessions | 7 ++++++-
x2goserver/bin/x2gomountdirs | 6 ++++++
x2goserver/bin/x2goprint | 3 ++-
x2goserver/bin/x2gosessionlimit | 8 ++++++++
x2goserver/bin/x2goshowblocks | 5 +++++
x2goserver/bin/x2goumount-session | 9 ++++++---
x2goserver/lib/x2gochangestatus | 7 ++++++-
x2goserver/lib/x2gocreatesession | 5 +++++
x2goserver/lib/x2gogetagent | 6 ++++++
x2goserver/lib/x2gogetdisplays | 6 ++++++
x2goserver/lib/x2gogetports | 8 +++++++-
x2goserver/lib/x2gogetservers | 6 ++++++
x2goserver/lib/x2goinsertport | 6 ++++++
x2goserver/lib/x2goinsertsession | 6 ++++++
x2goserver/lib/x2golistsessions_root | 10 +++++++++-
x2goserver/lib/x2golistsessions_sql | 6 ++++++
x2goserver/lib/x2goresume | 6 ++++++
x2goserver/lib/x2gosessionlimit | 8 ++++++++
x2goserver/lib/x2gosuspend-agent | 9 +++++++++
x2goserver/sbin/x2gocleansessions | 7 +++++++
x2goserver/sbin/x2godbadmin | 8 +++++++-
x2goserver/sbin/x2golistsessions_root | 10 +++++++++-
24 files changed, 151 insertions(+), 10 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index f4efee2..4df4777 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
with only parameter ,,loglevel''.
* Change x2gologlevel script into a Perl module (and a script that calls it).
Using x2gologlevel function in x2goprint to set loglevel mask.
+ * Initialize Syslog module for all Perl scripts in x2goserver package.
[ Martin Oehler ]
* Removes old debug code fragment, fixes x2golistsessions parsing.
diff --git a/x2goserver/bin/x2golistdesktops b/x2goserver/bin/x2golistdesktops
index 2679d6a..5642271 100755
--- a/x2goserver/bin/x2golistdesktops
+++ b/x2goserver/bin/x2golistdesktops
@@ -22,6 +22,14 @@
use strict;
use Sys::Hostname;
+use Sys::Syslog qw( :DEFAULT );
+
+use lib `echo -n \$(x2gobasepath)/lib/x2go`;
+use x2gologlevel;
+
+openlog($0,'cons,pid','user');
+setlogmask( LOG_UPTO(x2gologlevel()) );
+
my $serv=shift;
if( ! $serv)
diff --git a/x2goserver/bin/x2golistsessions b/x2goserver/bin/x2golistsessions
index a9ac4cf..56a943f 100755
--- a/x2goserver/bin/x2golistsessions
+++ b/x2goserver/bin/x2golistsessions
@@ -20,11 +20,16 @@
# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
-use Sys::Hostname;
use strict;
+use Sys::Hostname;
+use Sys::Syslog qw( :DEFAULT );
use lib `echo -n \$(x2gobasepath)/lib/x2go`;
use x2godbwrapper;
+use x2gologlevel;
+
+openlog($0,'cons,pid','user');
+setlogmask( LOG_UPTO(x2gologlevel()) );
sub check_stat
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index 2194da2..5364664 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -21,9 +21,15 @@
# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
use strict;
+use Sys::Syslog qw( :DEFAULT );
use lib `echo -n \$(x2gobasepath)/lib/x2go`;
use x2godbwrapper;
+use x2gologlevel;
+
+openlog($0,'cons,pid','user');
+setlogmask( LOG_UPTO(x2gologlevel()) );
+
my $type=shift;
my $session=shift;
diff --git a/x2goserver/bin/x2goprint b/x2goserver/bin/x2goprint
index cfe08b9..c75b49f 100755
--- a/x2goserver/bin/x2goprint
+++ b/x2goserver/bin/x2goprint
@@ -20,11 +20,11 @@
# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
+use strict;
use File::Basename;
use File::Copy;
use File::Path;
use Sys::Syslog qw( :DEFAULT );
-use strict;
use lib `echo -n \$(x2gobasepath)/lib/x2go`;
use x2godbwrapper;
@@ -33,6 +33,7 @@ use x2gologlevel;
openlog($0,'cons,pid','user');
setlogmask( LOG_UPTO(x2gologlevel()) );
+
sub check_root
{
my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid($<);
diff --git a/x2goserver/bin/x2gosessionlimit b/x2goserver/bin/x2gosessionlimit
index 3878c82..f2fc78c 100755
--- a/x2goserver/bin/x2gosessionlimit
+++ b/x2goserver/bin/x2gosessionlimit
@@ -22,6 +22,14 @@
use strict;
use Config::Simple;
+use Sys::Syslog qw( :DEFAULT );
+
+use lib `echo -n \$(x2gobasepath)/lib/x2go`;
+use x2gologlevel;
+
+openlog($0,'cons,pid','user');
+setlogmask( LOG_UPTO(x2gologlevel()) );
+
my $maxlimit=0;
my $Config = new Config::Simple(syntax=>'ini');
diff --git a/x2goserver/bin/x2goshowblocks b/x2goserver/bin/x2goshowblocks
index 0c15c39..4b898b2 100755
--- a/x2goserver/bin/x2goshowblocks
+++ b/x2goserver/bin/x2goshowblocks
@@ -21,9 +21,14 @@
# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
use strict;
+use Sys::Syslog qw( :DEFAULT );
use lib `echo -n \$(x2gobasepath)/lib/x2go`;
use x2godbwrapper;
+use x2gologlevel;
+
+openlog($0,'cons,pid','user');
+setlogmask( LOG_UPTO(x2gologlevel()) );
my $uname=shift;
diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session
index 81103e2..90c4f58 100755
--- a/x2goserver/bin/x2goumount-session
+++ b/x2goserver/bin/x2goumount-session
@@ -20,17 +20,20 @@
# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
-use Sys::Hostname;
use strict;
+use Sys::Hostname;
+use Sys::Syslog qw( :DEFAULT );
use lib `echo -n \$(x2gobasepath)/lib/x2go`;
use x2godbwrapper;
+use x2gologlevel;
+
+openlog($0,'cons,pid','user');
+setlogmask( LOG_UPTO(x2gologlevel()) );
my $session=shift;
my $only_path=shift;
-
-
my $uname=$ENV{'USER'};
my $serv=hostname;
diff --git a/x2goserver/lib/x2gochangestatus b/x2goserver/lib/x2gochangestatus
index 89696ba..216740b 100755
--- a/x2goserver/lib/x2gochangestatus
+++ b/x2goserver/lib/x2gochangestatus
@@ -21,10 +21,15 @@
# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
use strict;
-
+use Sys::Syslog qw( :DEFAULT );
use lib `echo -n \$(x2gobasepath)/lib/x2go`;
use x2godbwrapper;
+use x2gologlevel;
+
+openlog($0,'cons,pid','user');
+setlogmask( LOG_UPTO(x2gologlevel()) );
+
my $status=shift or die;
my $sid=shift or die;
diff --git a/x2goserver/lib/x2gocreatesession b/x2goserver/lib/x2gocreatesession
index 425a5d0..e43024e 100755
--- a/x2goserver/lib/x2gocreatesession
+++ b/x2goserver/lib/x2gocreatesession
@@ -21,9 +21,14 @@
# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
use strict;
+use Sys::Syslog qw( :DEFAULT );
use lib `echo -n \$(x2gobasepath)/lib/x2go`;
use x2godbwrapper;
+use x2gologlevel;
+
+openlog($0,'cons,pid','user');
+setlogmask( LOG_UPTO(x2gologlevel()) );
my $cookie=shift or die;
diff --git a/x2goserver/lib/x2gogetagent b/x2goserver/lib/x2gogetagent
index 5987942..635a731 100755
--- a/x2goserver/lib/x2gogetagent
+++ b/x2goserver/lib/x2gogetagent
@@ -21,9 +21,15 @@
# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
use strict;
+use Sys::Syslog qw( :DEFAULT );
use lib `echo -n \$(x2gobasepath)/lib/x2go`;
use x2godbwrapper;
+use x2gologlevel;
+
+openlog($0,'cons,pid','user');
+setlogmask( LOG_UPTO(x2gologlevel()) );
+
my $sid=shift or die;
print db_getagent $sid;
diff --git a/x2goserver/lib/x2gogetdisplays b/x2goserver/lib/x2gogetdisplays
index e07b8b1..e6858d4 100755
--- a/x2goserver/lib/x2gogetdisplays
+++ b/x2goserver/lib/x2gogetdisplays
@@ -21,9 +21,15 @@
# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
use strict;
+use Sys::Syslog qw( :DEFAULT );
use lib `echo -n \$(x2gobasepath)/lib/x2go`;
use x2godbwrapper;
+use x2gologlevel;
+
+openlog($0,'cons,pid','user');
+setlogmask( LOG_UPTO(x2gologlevel()) );
+
my $host=shift or die;
print join("\n", db_getdisplays($host));
diff --git a/x2goserver/lib/x2gogetports b/x2goserver/lib/x2gogetports
index 27dc74c..aee7151 100755
--- a/x2goserver/lib/x2gogetports
+++ b/x2goserver/lib/x2gogetports
@@ -21,9 +21,15 @@
# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
use strict;
+use Sys::Syslog qw( :DEFAULT );
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;;
+use lib `echo -n \$(x2gobasepath)/lib/x2go`;
use x2godbwrapper;
+use x2gologlevel;
+
+openlog($0,'cons,pid','user');
+setlogmask( LOG_UPTO(x2gologlevel()) );
+
my $host=shift or die;
print join("\n", db_getports($host));
diff --git a/x2goserver/lib/x2gogetservers b/x2goserver/lib/x2gogetservers
index fcc57a8..a776dff 100755
--- a/x2goserver/lib/x2gogetservers
+++ b/x2goserver/lib/x2gogetservers
@@ -21,8 +21,14 @@
# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
use strict;
+use Sys::Syslog qw( :DEFAULT );
use lib `echo -n \$(x2gobasepath)/lib/x2go`;
use x2godbwrapper;
+use x2gologlevel;
+
+openlog($0,'cons,pid','user');
+setlogmask( LOG_UPTO(x2gologlevel()) );
+
print join("\n", db_getservers);
diff --git a/x2goserver/lib/x2goinsertport b/x2goserver/lib/x2goinsertport
index 1458348..ae5fc5b 100755
--- a/x2goserver/lib/x2goinsertport
+++ b/x2goserver/lib/x2goinsertport
@@ -21,9 +21,15 @@
# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
use strict;
+use Sys::Syslog qw( :DEFAULT );
use lib `echo -n \$(x2gobasepath)/lib/x2go`;
use x2godbwrapper;
+use x2gologlevel;
+
+openlog($0,'cons,pid','user');
+setlogmask( LOG_UPTO(x2gologlevel()) );
+
my $server=shift or die;
my $sid=shift or die;
diff --git a/x2goserver/lib/x2goinsertsession b/x2goserver/lib/x2goinsertsession
index 74b0c25..b4fdbfa 100755
--- a/x2goserver/lib/x2goinsertsession
+++ b/x2goserver/lib/x2goinsertsession
@@ -21,9 +21,15 @@
# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
use strict;
+use Sys::Syslog qw( :DEFAULT );
use lib `echo -n \$(x2gobasepath)/lib/x2go`;
use x2godbwrapper;
+use x2gologlevel;
+
+openlog($0,'cons,pid','user');
+setlogmask( LOG_UPTO(x2gologlevel()) );
+
my $display=shift or die;
my $server=shift or die;
diff --git a/x2goserver/lib/x2golistsessions_root b/x2goserver/lib/x2golistsessions_root
index 1e60493..af64328 100755
--- a/x2goserver/lib/x2golistsessions_root
+++ b/x2goserver/lib/x2golistsessions_root
@@ -20,8 +20,16 @@
# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
-use Sys::Hostname;
use strict;
+use Sys::Hostname;
+use Sys::Syslog qw( :DEFAULT );
+
+use lib `echo -n \$(x2gobasepath)/lib/x2go`;
+use x2gologlevel;
+
+openlog($0,'cons,pid','user');
+setlogmask( LOG_UPTO(x2gologlevel()) );
+
sub check_stat
{
diff --git a/x2goserver/lib/x2golistsessions_sql b/x2goserver/lib/x2golistsessions_sql
index 7ffd2e2..86a9c94 100755
--- a/x2goserver/lib/x2golistsessions_sql
+++ b/x2goserver/lib/x2golistsessions_sql
@@ -21,9 +21,15 @@
# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
use strict;
+use Sys::Syslog qw( :DEFAULT );
use lib `echo -n \$(x2gobasepath)/lib/x2go`;
use x2godbwrapper;
+use x2gologlevel;
+
+openlog($0,'cons,pid','user');
+setlogmask( LOG_UPTO(x2gologlevel()) );
+
my $serv=shift;
my @array;
diff --git a/x2goserver/lib/x2goresume b/x2goserver/lib/x2goresume
index e21006c..80010e1 100755
--- a/x2goserver/lib/x2goresume
+++ b/x2goserver/lib/x2goresume
@@ -21,9 +21,15 @@
# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
use strict;
+use Sys::Syslog qw( :DEFAULT );
use lib `echo -n \$(x2gobasepath)/lib/x2go`;
use x2godbwrapper;
+use x2gologlevel;
+
+openlog($0,'cons,pid','user');
+setlogmask( LOG_UPTO(x2gologlevel()) );
+
my $client=shift or die;
my $sid=shift or die;
diff --git a/x2goserver/lib/x2gosessionlimit b/x2goserver/lib/x2gosessionlimit
index 3878c82..f2fc78c 100755
--- a/x2goserver/lib/x2gosessionlimit
+++ b/x2goserver/lib/x2gosessionlimit
@@ -22,6 +22,14 @@
use strict;
use Config::Simple;
+use Sys::Syslog qw( :DEFAULT );
+
+use lib `echo -n \$(x2gobasepath)/lib/x2go`;
+use x2gologlevel;
+
+openlog($0,'cons,pid','user');
+setlogmask( LOG_UPTO(x2gologlevel()) );
+
my $maxlimit=0;
my $Config = new Config::Simple(syntax=>'ini');
diff --git a/x2goserver/lib/x2gosuspend-agent b/x2goserver/lib/x2gosuspend-agent
index 272d819..928cec4 100755
--- a/x2goserver/lib/x2gosuspend-agent
+++ b/x2goserver/lib/x2gosuspend-agent
@@ -20,6 +20,15 @@
# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
+use Sys::Syslog qw( :DEFAULT );
+
+use lib `echo -n \$(x2gobasepath)/lib/x2go`;
+use x2gologlevel;
+
+openlog($0,'cons,pid','user');
+setlogmask( LOG_UPTO(x2gologlevel()) );
+
+
shift;
shift;
shift;
diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions
index b82214d..f8675ca 100755
--- a/x2goserver/sbin/x2gocleansessions
+++ b/x2goserver/sbin/x2gocleansessions
@@ -21,9 +21,16 @@
# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
use Sys::Hostname;
+use Sys::Syslog qw( :DEFAULT );
use strict;
my $x2go_lib_path=`echo -n \$(x2gobasepath)/lib/x2go`;
+use lib $x2go_lib_path;
+use x2gologlevel;
+
+openlog($0,'cons,pid','user');
+setlogmask( LOG_UPTO(x2gologlevel()) );
+
sub check_pid
{
diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin
index b03e6aa..a789afd 100755
--- a/x2goserver/sbin/x2godbadmin
+++ b/x2goserver/sbin/x2godbadmin
@@ -21,11 +21,17 @@
# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
use strict;
-
+use Sys::Syslog qw( :DEFAULT );
use Getopt::Long;
use Config::Simple;
use DBI;
+use lib `echo -n \$(x2gobasepath)/lib/x2go`;
+use x2gologlevel;
+
+openlog($0,'cons,pid','user');
+setlogmask( LOG_UPTO(x2gologlevel()) );
+
sub show_usage()
{
print "X2Go SQL admin interface. Use it to create x2go database and insert or remove users or groups in x2go database\n".
diff --git a/x2goserver/sbin/x2golistsessions_root b/x2goserver/sbin/x2golistsessions_root
index df92ff5..24bb5d4 100755
--- a/x2goserver/sbin/x2golistsessions_root
+++ b/x2goserver/sbin/x2golistsessions_root
@@ -19,8 +19,16 @@
# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
-use Sys::Hostname;
use strict;
+use Sys::Hostname;
+use Sys::Syslog qw( :DEFAULT );
+
+use lib `echo -n \$(x2gobasepath)/lib/x2go`;
+use x2gologlevel;
+
+openlog($0,'cons,pid','user');
+setlogmask( LOG_UPTO(x2gologlevel()) );
+
sub check_stat
{
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