x2goserver.git - build-baikal (branch) updated: 3.0.99-2-228-g4c778c0 - x2go-commits

3 Jan 2014

The branch, build-baikal has been updated
       via  4c778c0a532a0c5724a0e88428aa041aca16e481 (commit)
      from  fdb1e9006629617de1b83c1871999a4132c75c8b (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/x2golistdesktops       |    2 +-
 x2goserver/bin/x2golistsessions       |    2 +-
 x2goserver/bin/x2gomountdirs          |    2 +-
 x2goserver/bin/x2goprint              |    2 +-
 x2goserver/bin/x2gosessionlimit       |    2 +-
 x2goserver/bin/x2goshowblocks         |    2 +-
 x2goserver/bin/x2goumount-session     |    2 +-
 x2goserver/lib/x2gochangestatus       |    2 +-
 x2goserver/lib/x2gocreatesession      |    2 +-
 x2goserver/lib/x2godbwrapper.pm       |   63 +++++++++++++++++++++++++--------
 x2goserver/lib/x2gogetagent           |    6 ++--
 x2goserver/lib/x2gogetdisplays        |    5 +--
 x2goserver/lib/x2gogetports           |    6 ++--
 x2goserver/lib/x2gogetservers         |    6 ++--
 x2goserver/lib/x2goinsertport         |    2 +-
 x2goserver/lib/x2goinsertsession      |    2 +-
 x2goserver/lib/x2golistsessions_root  |    3 +-
 x2goserver/lib/x2golistsessions_sql   |    6 ++--
 x2goserver/lib/x2goresume             |    2 +-
 x2goserver/lib/x2gosqlitewrapper.pl   |    1 -
 x2goserver/lib/x2gosuspend-agent      |    3 +-
 x2goserver/sbin/x2gocleansessions     |    4 +--
 x2goserver/sbin/x2godbadmin           |    2 +-
 x2goserver/sbin/x2golistsessions_root |    2 +-
 25 files changed, 88 insertions(+), 45 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index 4df4777..344472d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
   * 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.
+  * Add debugging support for almost all DB functions in x2godbwrapper.pm, fix for
+    Syslog module initialization in all Perl scripts.
 
   [ Martin Oehler ]
   * Removes old debug code fragment, fixes x2golistsessions parsing.
diff --git a/x2goserver/bin/x2golistdesktops b/x2goserver/bin/x2golistdesktops
index 5642271..9c235b4 100755
--- a/x2goserver/bin/x2golistdesktops
+++ b/x2goserver/bin/x2golistdesktops
@@ -22,7 +22,7 @@
 
 use strict;
 use Sys::Hostname;
-use Sys::Syslog qw( :DEFAULT );
+use Sys::Syslog qw( :standard :macros );
 
 use lib `echo -n \$(x2gobasepath)/lib/x2go`;
 use x2gologlevel;
diff --git a/x2goserver/bin/x2golistsessions b/x2goserver/bin/x2golistsessions
index 56a943f..56d9e40 100755
--- a/x2goserver/bin/x2golistsessions
+++ b/x2goserver/bin/x2golistsessions
@@ -22,7 +22,7 @@
 
 use strict;
 use Sys::Hostname;
-use Sys::Syslog qw( :DEFAULT );
+use Sys::Syslog qw( :standard :macros );
 
 use lib `echo -n \$(x2gobasepath)/lib/x2go`;
 use x2godbwrapper; 
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index 5364664..86b671d 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -21,7 +21,7 @@
 # Copyright (C) 2007-2011  Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de>
 
 use strict;
-use Sys::Syslog qw( :DEFAULT );
+use Sys::Syslog qw( :standard :macros );
 
 use lib `echo -n \$(x2gobasepath)/lib/x2go`;
 use x2godbwrapper;
diff --git a/x2goserver/bin/x2goprint b/x2goserver/bin/x2goprint
index c75b49f..8d76ff0 100755
--- a/x2goserver/bin/x2goprint
+++ b/x2goserver/bin/x2goprint
@@ -24,7 +24,7 @@ use strict;
 use File::Basename;
 use File::Copy;
 use File::Path;
-use Sys::Syslog qw( :DEFAULT );
+use Sys::Syslog qw( :standard :macros );
 
 use lib `echo -n \$(x2gobasepath)/lib/x2go`;
 use x2godbwrapper;
diff --git a/x2goserver/bin/x2gosessionlimit b/x2goserver/bin/x2gosessionlimit
index f2fc78c..43e67b5 100755
--- a/x2goserver/bin/x2gosessionlimit
+++ b/x2goserver/bin/x2gosessionlimit
@@ -22,7 +22,7 @@
 
 use strict;
 use Config::Simple;
-use Sys::Syslog qw( :DEFAULT );
+use Sys::Syslog qw( :standard :macros );
 
 use lib `echo -n \$(x2gobasepath)/lib/x2go`;
 use x2gologlevel;
diff --git a/x2goserver/bin/x2goshowblocks b/x2goserver/bin/x2goshowblocks
index 4b898b2..7988fb1 100755
--- a/x2goserver/bin/x2goshowblocks
+++ b/x2goserver/bin/x2goshowblocks
@@ -21,7 +21,7 @@
 # Copyright (C) 2007-2011  Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de>
 
 use strict;
-use Sys::Syslog qw( :DEFAULT );
+use Sys::Syslog qw( :standard :macros );
 
 use lib `echo -n \$(x2gobasepath)/lib/x2go`;
 use x2godbwrapper; 
diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session
index 90c4f58..96b5d21 100755
--- a/x2goserver/bin/x2goumount-session
+++ b/x2goserver/bin/x2goumount-session
@@ -22,7 +22,7 @@
 
 use strict;
 use Sys::Hostname;
-use Sys::Syslog qw( :DEFAULT );
+use Sys::Syslog qw( :standard :macros );
 
 use lib `echo -n \$(x2gobasepath)/lib/x2go`;
 use x2godbwrapper; 
diff --git a/x2goserver/lib/x2gochangestatus b/x2goserver/lib/x2gochangestatus
index 216740b..ef0fb7a 100755
--- a/x2goserver/lib/x2gochangestatus
+++ b/x2goserver/lib/x2gochangestatus
@@ -21,7 +21,7 @@
 # Copyright (C) 2007-2011  Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de>
 
 use strict;
-use Sys::Syslog qw( :DEFAULT );
+use Sys::Syslog qw( :standard :macros );
 
 use lib `echo -n \$(x2gobasepath)/lib/x2go`;
 use x2godbwrapper; 
diff --git a/x2goserver/lib/x2gocreatesession b/x2goserver/lib/x2gocreatesession
index e43024e..8bf0852 100755
--- a/x2goserver/lib/x2gocreatesession
+++ b/x2goserver/lib/x2gocreatesession
@@ -21,7 +21,7 @@
 # Copyright (C) 2007-2011  Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de>
 
 use strict;
-use Sys::Syslog qw( :DEFAULT );
+use Sys::Syslog qw( :standard :macros );
 
 use lib `echo -n \$(x2gobasepath)/lib/x2go`;
 use x2godbwrapper; 
diff --git a/x2goserver/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm
index da3c121..454193b 100644
--- a/x2goserver/lib/x2godbwrapper.pm
+++ b/x2goserver/lib/x2godbwrapper.pm
@@ -23,10 +23,16 @@ package x2godbwrapper;
 use strict;
 use Config::Simple;
 use DBI;
-
 use POSIX;
+use Sys::Syslog qw( :standard :macros );
 
 my $x2go_lib_path=`echo -n \$(x2gobasepath)/lib/x2go`;
+use lib `echo -n \$(x2gobasepath)/lib/x2go`;
+use x2gologlevel;
+
+openlog($0,'cons,pid','user');
+setlogmask( LOG_UPTO(x2gologlevel()) );
+
 
 my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid(getuid());
 
@@ -165,6 +171,7 @@ sub dbsys_listsessionsroot_all
 
 sub dbsys_getmounts
 {
+	my $mounts;
 	my $sid=shift or die "argument \"session_id\" missed";
 	if ($backend eq 'postgres')
 	{
@@ -180,16 +187,20 @@ sub dbsys_getmounts
 		}
 		$sth->finish();
 		$dbh->disconnect();
-		return @strings;
+		$mounts = @strings;
 	}
 	if ($backend eq 'sqlite')
 	{
-		return split("\n",`$x2go_lib_path/x2gosqlitewrapper getmounts $sid`);
+		$mounts = split("\n",`$x2go_lib_path/x2gosqlitewrapper getmounts $sid`);
 	}
+	my $log_retval = join(" ", $mounts);
+	syslog('debug', "dbsys_getmounts called, session ID: $sid; return value: $log_retval");
+	return $mounts
 }
 
 sub db_getmounts
 {
+	my $mounts;
 	my $sid=shift or die "argument \"session_id\" missed";
 	if($backend eq 'postgres')
 	{
@@ -205,12 +216,15 @@ sub db_getmounts
 		}
 		$sth->finish();
 		$dbh->disconnect();
-		return @strings;
+		$mounts = @strings;
 	}
 	if ($backend eq 'sqlite')
 	{
-		return split("\n",`$x2go_lib_path/x2gosqlitewrapper getmounts $sid`);
+		$mounts = split("\n",`$x2go_lib_path/x2gosqlitewrapper getmounts $sid`);
 	}
+	my $log_retval = join(" ", $mounts);
+	syslog('debug', "db_getmounts called, session ID: $sid; return value: $log_retval");
+	return $mounts
 }
 
 sub db_deletemount
@@ -229,6 +243,7 @@ sub db_deletemount
 	{
 		`$x2go_lib_path/x2gosqlitewrapper deletemount $sid \"$path\"`;
 	}
+	syslog('debug', "db_deletemount called, session ID: $sid, path: $path");
 }
 
 sub db_insertmount
@@ -256,6 +271,7 @@ sub db_insertmount
 			$res_ok=1;
 		}
 	}
+	syslog('debug', "db_insertmount called, session ID: $sid, path: $path, client: $client; return value: $res_ok");
 	return $res_ok;
 }
 
@@ -280,6 +296,7 @@ sub db_insertsession
 			die "$err: $x2go_lib_path/x2gosqlitewrapper insertsession $display $server $sid";
 		}
 	}
+	syslog('debug', "db_insertsession called, session ID: $sid, server: $server, session ID: $sid");
 }
 
 sub db_createsession
@@ -309,6 +326,7 @@ sub db_createsession
 			die $err;
 		}
 	}
+	syslog('debug', "db_createsession called, session ID: $sid, cookie: $cookie, client: $client, pid: $pid, graphics port: $gr_port, sound port: $snd_port, file sharing port: $fs_port");
 }
 
 sub db_insertport
@@ -328,6 +346,7 @@ sub db_insertport
 	{
 		`$x2go_lib_path/x2gosqlitewrapper insertport $server $sid $sshport`;
 	}
+	syslog('debug', "db_insertport called, session ID: $sid, server: $server, SSH port: $sshport");
 }
 
 sub db_resume
@@ -346,6 +365,7 @@ sub db_resume
 	{
 		`$x2go_lib_path/x2gosqlitewrapper resume $client $sid`;
 	}
+	syslog('debug', "db_resume called, session ID: $sid, client: $client");
 }
 
 sub db_changestatus
@@ -364,10 +384,12 @@ sub db_changestatus
 	{
 		`$x2go_lib_path/x2gosqlitewrapper changestatus $status $sid`;
 	}
+	syslog('debug', "db_changestatus called, session ID: $sid, new status: $status");
 }
 
 sub db_getdisplays
 {
+	my $displays;
 	#ignore $server
 	my $server=shift or die "argument \"server\" missed";         
 	if ($backend eq 'postgres')
@@ -384,16 +406,20 @@ sub db_getdisplays
 		}
 		$sth->finish();
 		$dbh->disconnect();
-		return @strings;
+		$displays = @strings;
 	}
 	if ($backend eq 'sqlite')
 	{
-		return split("\n",`$x2go_lib_path/x2gosqlitewrapper getdisplays $server`);
+		$displays = split("\n",`$x2go_lib_path/x2gosqlitewrapper getdisplays $server`);
 	}
+	my $log_retval = join(" ", $displays);
+	syslog('debug', "db_getdisplays called, server: $server; return value: $log_retval");
+	return $displays;
 }
 
 sub db_getports
 {
+	my $ports;
 	#ignore $server
 	my $server=shift or die "argument \"server\" missed";         
 	if ($backend eq 'postgres')
@@ -410,16 +436,20 @@ sub db_getports
 		}
 		$sth->finish();
 		$dbh->disconnect();
-		return @strings;
+		$ports = @strings;
 	}
 	if ($backend eq 'sqlite')
 	{
-		return split("\n",`$x2go_lib_path/x2gosqlitewrapper getports $server`);
+		$ports = split("\n",`$x2go_lib_path/x2gosqlitewrapper getports $server`);
 	}
+	my $log_retval = join(" ", $ports);
+	syslog('debug', "db_getports called, server: $server; return value: $log_retval");
+	return $ports;
 }
 
 sub db_getservers
 {
+	my $servers;
 	if ($backend eq 'postgres')
 	{
 		my @strings;
@@ -434,18 +464,21 @@ sub db_getservers
 		}
 		$sth->finish();
 		$dbh->disconnect();
-		return @strings;
+		$servers = @strings;
 	}
-		if ($backend eq 'sqlite')
+	if ($backend eq 'sqlite')
 	{
-		return split("\n",`$x2go_lib_path/x2gosqlitewrapper getservers`);
+		$servers = split("\n",`$x2go_lib_path/x2gosqlitewrapper getservers`);
 	}
+	my $log_retval = join(" ", $servers);
+	syslog('debug', "db_getservers called, return value: $log_retval");
+	return $servers;
 }
 
 sub db_getagent
 {
-	my $sid=shift or die "argument \"session_id\" missed";
 	my $agent;
+	my $sid=shift or die "argument \"session_id\" missed";
 	if ($backend eq 'postgres')
 	{
 		my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_;
@@ -465,13 +498,14 @@ sub db_getagent
 	{
 		$agent=`$x2go_lib_path/x2gosqlitewrapper getagent $sid`;
 	}
+	syslog('debug', "db_getagent called, session ID: $sid; return value: $agent");
 	return $agent;
 }
 
 sub db_getdisplay
 {
-	my $sid=shift or die "argument \"session_id\" missed";
 	my $display;
+	my $sid=shift or die "argument \"session_id\" missed";
 	if ($backend eq 'postgres')
 	{
 		my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_;
@@ -491,6 +525,7 @@ sub db_getdisplay
 	{
 		$display=`$x2go_lib_path/x2gosqlitewrapper getdisplay $sid`;
 	}
+	syslog('debug', "db_getdisplay called, session ID: $sid; return value: $display");
 	return $display;
 }
 
diff --git a/x2goserver/lib/x2gogetagent b/x2goserver/lib/x2gogetagent
index 635a731..be57906 100755
--- a/x2goserver/lib/x2gogetagent
+++ b/x2goserver/lib/x2gogetagent
@@ -21,7 +21,7 @@
 # Copyright (C) 2007-2011  Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de>
 
 use strict;
-use Sys::Syslog qw( :DEFAULT );
+use Sys::Syslog qw( :standard :macros );
 
 use lib `echo -n \$(x2gobasepath)/lib/x2go`;
 use x2godbwrapper; 
@@ -30,6 +30,6 @@ use x2gologlevel;
 openlog($0,'cons,pid','user');
 setlogmask( LOG_UPTO(x2gologlevel()) );
 
-
 my $sid=shift or die;
-print db_getagent $sid;
+my $agent = db_getagent $sid;
+print $agent;
\ No newline at end of file
diff --git a/x2goserver/lib/x2gogetdisplays b/x2goserver/lib/x2gogetdisplays
index e6858d4..8bdd705 100755
--- a/x2goserver/lib/x2gogetdisplays
+++ b/x2goserver/lib/x2gogetdisplays
@@ -21,7 +21,7 @@
 # Copyright (C) 2007-2011  Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de>
 
 use strict;
-use Sys::Syslog qw( :DEFAULT );
+use Sys::Syslog qw( :standard :macros );
 
 use lib `echo -n \$(x2gobasepath)/lib/x2go`;
 use x2godbwrapper; 
@@ -32,4 +32,5 @@ setlogmask( LOG_UPTO(x2gologlevel()) );
 
 
 my $host=shift or die;
-print join("\n", db_getdisplays($host));
+my $displays = join("\n", db_getdisplays($host));
+print $displays;
diff --git a/x2goserver/lib/x2gogetports b/x2goserver/lib/x2gogetports
index aee7151..831c80a 100755
--- a/x2goserver/lib/x2gogetports
+++ b/x2goserver/lib/x2gogetports
@@ -21,7 +21,7 @@
 # Copyright (C) 2007-2011  Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de>
 
 use strict;
-use Sys::Syslog qw( :DEFAULT );
+use Sys::Syslog qw( :standard :macros );
 
 use lib `echo -n \$(x2gobasepath)/lib/x2go`;
 use x2godbwrapper; 
@@ -32,4 +32,6 @@ setlogmask( LOG_UPTO(x2gologlevel()) );
 
 
 my $host=shift or die;
-print join("\n", db_getports($host));
+
+my $ports = join("\n", db_getports($host));
+print $ports;
diff --git a/x2goserver/lib/x2gogetservers b/x2goserver/lib/x2gogetservers
index a776dff..6dd9493 100755
--- a/x2goserver/lib/x2gogetservers
+++ b/x2goserver/lib/x2gogetservers
@@ -21,7 +21,7 @@
 # Copyright (C) 2007-2011  Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de>
 
 use strict;
-use Sys::Syslog qw( :DEFAULT );
+use Sys::Syslog qw( :standard :macros );
 
 use lib `echo -n \$(x2gobasepath)/lib/x2go`;
 use x2godbwrapper; 
@@ -30,5 +30,5 @@ use x2gologlevel;
 openlog($0,'cons,pid','user');
 setlogmask( LOG_UPTO(x2gologlevel()) );
 
-
-print join("\n", db_getservers);
+my $servers = join("\n", db_getservers);
+print $servers;
diff --git a/x2goserver/lib/x2goinsertport b/x2goserver/lib/x2goinsertport
index ae5fc5b..5ff1c8c 100755
--- a/x2goserver/lib/x2goinsertport
+++ b/x2goserver/lib/x2goinsertport
@@ -21,7 +21,7 @@
 # Copyright (C) 2007-2011  Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de>
 
 use strict;
-use Sys::Syslog qw( :DEFAULT );
+use Sys::Syslog qw( :standard :macros );
 
 use lib `echo -n \$(x2gobasepath)/lib/x2go`;
 use x2godbwrapper; 
diff --git a/x2goserver/lib/x2goinsertsession b/x2goserver/lib/x2goinsertsession
index b4fdbfa..e7a5640 100755
--- a/x2goserver/lib/x2goinsertsession
+++ b/x2goserver/lib/x2goinsertsession
@@ -21,7 +21,7 @@
 # Copyright (C) 2007-2011  Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de>
 
 use strict;
-use Sys::Syslog qw( :DEFAULT );
+use Sys::Syslog qw( :standard :macros );
 
 use lib `echo -n \$(x2gobasepath)/lib/x2go`;
 use x2godbwrapper; 
diff --git a/x2goserver/lib/x2golistsessions_root b/x2goserver/lib/x2golistsessions_root
index af64328..a6f9b64 100755
--- a/x2goserver/lib/x2golistsessions_root
+++ b/x2goserver/lib/x2golistsessions_root
@@ -22,7 +22,7 @@
 
 use strict;
 use Sys::Hostname;
-use Sys::Syslog qw( :DEFAULT );
+use Sys::Syslog qw( :standard :macros );
 
 use lib `echo -n \$(x2gobasepath)/lib/x2go`;
 use x2gologlevel;
@@ -74,6 +74,7 @@ for (my $i=0;$i<@outp;$i++)
 				@outp[$i] =~ s/\|R\|/\|S\|/;
 			}
 		}
+		syslog('debug', "x2golistsessions_root has been called...");
 		print "@outp[$i]\n";
 	}
 }
diff --git a/x2goserver/lib/x2golistsessions_sql b/x2goserver/lib/x2golistsessions_sql
index 86a9c94..4549d0e 100755
--- a/x2goserver/lib/x2golistsessions_sql
+++ b/x2goserver/lib/x2golistsessions_sql
@@ -21,7 +21,7 @@
 # Copyright (C) 2007-2011  Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de>
 
 use strict;
-use Sys::Syslog qw( :DEFAULT );
+use Sys::Syslog qw( :standard :macros );
 
 use lib `echo -n \$(x2gobasepath)/lib/x2go`;
 use x2godbwrapper; 
@@ -47,7 +47,9 @@ for ( $i=0;$i<@array;$i++)
 	my @ln=split('\|',@array[$i]);
 	if (@ln[4] eq "F")
 	{
-		dbsys_rmsessionsroot( @ln[1]);
+		my $sid = @ln[1]
+		dbsys_rmsessionsroot($sid);
+		syslog('debug', "Purging finished session from X2go db, session ID: $sid");
 	}
 	print "@array[$i]\n";
 }
diff --git a/x2goserver/lib/x2goresume b/x2goserver/lib/x2goresume
index 80010e1..56ec24c 100755
--- a/x2goserver/lib/x2goresume
+++ b/x2goserver/lib/x2goresume
@@ -21,7 +21,7 @@
 # Copyright (C) 2007-2011  Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de>
 
 use strict;
-use Sys::Syslog qw( :DEFAULT );
+use Sys::Syslog qw( :standard :macros );
 
 use lib `echo -n \$(x2gobasepath)/lib/x2go`;
 use x2godbwrapper; 
diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl
index 0beef3a..641cb9c 100755
--- a/x2goserver/lib/x2gosqlitewrapper.pl
+++ b/x2goserver/lib/x2gosqlitewrapper.pl
@@ -21,7 +21,6 @@
 # Copyright (C) 2007-2011  Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de>
 
 use strict;
-
 use DBI;
 use POSIX;
 
diff --git a/x2goserver/lib/x2gosuspend-agent b/x2goserver/lib/x2gosuspend-agent
index 928cec4..4d9f9f9 100755
--- a/x2goserver/lib/x2gosuspend-agent
+++ b/x2goserver/lib/x2gosuspend-agent
@@ -20,7 +20,8 @@
 # Copyright (C) 2007-2011  Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>
 # Copyright (C) 2007-2011  Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de>
 
-use Sys::Syslog qw( :DEFAULT );
+strict;
+use Sys::Syslog qw( :standard :macros );
 
 use lib `echo -n \$(x2gobasepath)/lib/x2go`;
 use x2gologlevel;
diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions
index 1952645..af5afee 100755
--- a/x2goserver/sbin/x2gocleansessions
+++ b/x2goserver/sbin/x2gocleansessions
@@ -20,9 +20,9 @@
 # Copyright (C) 2007-2011  Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>
 # Copyright (C) 2007-2011  Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de>
 
-use Sys::Hostname;
-use Sys::Syslog qw( :DEFAULT );
 use strict;
+use Sys::Hostname;
+use Sys::Syslog qw( :standard :macros );
 
 my $x2go_lib_path=`echo -n \$(x2gobasepath)/lib/x2go`;
 use lib `echo -n \$(x2gobasepath)/lib/x2go`;
diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin
index a789afd..441b176 100755
--- a/x2goserver/sbin/x2godbadmin
+++ b/x2goserver/sbin/x2godbadmin
@@ -21,7 +21,7 @@
 # Copyright (C) 2007-2011  Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de>
 
 use strict;
-use Sys::Syslog qw( :DEFAULT );
+use Sys::Syslog qw( :standard :macros );
 use Getopt::Long;
 use Config::Simple;   
 use DBI;
diff --git a/x2goserver/sbin/x2golistsessions_root b/x2goserver/sbin/x2golistsessions_root
index 24bb5d4..6f4a510 100755
--- a/x2goserver/sbin/x2golistsessions_root
+++ b/x2goserver/sbin/x2golistsessions_root
@@ -21,7 +21,7 @@
 
 use strict;
 use Sys::Hostname;
-use Sys::Syslog qw( :DEFAULT );
+use Sys::Syslog qw( :standard :macros );
 
 use lib `echo -n \$(x2gobasepath)/lib/x2go`;
 use x2gologlevel;


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).

    