[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-58-g539006b

[X2Go dev team]

The branch, master has been updated
       via  539006bf0a1b87dd6ac75379f3006155974580ae (commit)
       via  b55d2e2d9f29e215dd86b5a2dc4f0e2b8e0e5aef (commit)
      from  cab3afacac64ddc20569521025b238fd1e270ce3 (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 539006bf0a1b87dd6ac75379f3006155974580ae
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Sep 21 11:02:11 2012 +0200

    Fix new SQLite3 wrapper for db_getmounts Perl call.

commit b55d2e2d9f29e215dd86b5a2dc4f0e2b8e0e5aef
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Sep 21 00:56:17 2012 +0200

    make sure the x2gouser can access his own home

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    1 +
 debian/x2goserver-common.postinst                  |    7 ++++++-
 debian/x2goserver-printing.postinst                |    1 +
 .../lib/libx2go-server-db-sqlite3-wrapper.pl       |   10 +++++-----
 4 files changed, 13 insertions(+), 6 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index d4b91ec..95c7108 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low
     - Only extend LD_LIBRARY_PATH by Xrandr extension for KDE. Breaks GNOME.
     - Install /etc/x2go/x2go_logout with its directory x2go_logout.d via
       Makefile installation.
+    - Fix new SQLite3 wrapper for db_getmounts Perl call.
   * /debian/control:
     + Maintainer change in package: X2Go Developers <x2go-dev at lists.berlios.de>.
     + Depend on nx-libs (>=3.5.0.15-0~) which has the Xrandr symlinks folder.
diff --git a/debian/x2goserver-common.postinst b/debian/x2goserver-common.postinst
index 7c0123b..03fb701 100755
--- a/debian/x2goserver-common.postinst
+++ b/debian/x2goserver-common.postinst
@@ -36,6 +36,9 @@ case "$1" in
 			adduser --system --no-create-home \
 			        --disabled-password --disabled-login \
 			        --shell /bin/false --group --home /var/lib/x2go x2gouser
+
+			# make sure the home directory belongs to x2gouser:x2gouser
+			chown x2gouser:x2gouser /var/lib/x2go -Rf
 		else
 			echo "User x2gouser already exists." >&2
 			# make sure all settings are appropriate
@@ -50,8 +53,10 @@ case "$1" in
 			fi
 			# we leave user shell alone. we have never set this wrongly
 			# and we need to respect the administrator's choices
-		fi
 
+			# make sure the home directory belongs to x2gouser:x2gouser
+			chown x2gouser:x2gouser /var/lib/x2go -Rf
+		fi
 		;;
 
 	abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/x2goserver-printing.postinst b/debian/x2goserver-printing.postinst
index b17c55e..92d8cec 100755
--- a/debian/x2goserver-printing.postinst
+++ b/debian/x2goserver-printing.postinst
@@ -52,6 +52,7 @@ case "$1" in
 			fi
 			# we leave user shell alone. we have never set this wrongly
 			# and we need to respect the administrator's choices
+
 		fi
 
 		# make sure x2goprint spool dir permissions are set correctly
diff --git a/libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl b/libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl
index a1e5578..df5d18f 100755
--- a/libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl
+++ b/libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl
@@ -43,7 +43,7 @@ sub print_result
 
 sub print_result_list
 {
-	while ( shift )
+	foreach ( shift )
 	{
 		print @_, "\n";
 	}
@@ -56,10 +56,10 @@ my $cmd=shift or die "command not specified";
 # call the corresponding function in the X2Go::Server:DB:SQLite3 package
 switch ($cmd)
 {
-	case /.*list.*root/ { @result_list = eval("X2Go::Server::DB::SQLite3::dbsys_$cmd(\@ARGV)") }
-	case /.*list.*/	    { @result_list = eval("X2Go::Server::DB::SQLite3::db_$cmd(\@ARGV)") }
-	case /.*root/       { $result = eval("X2Go::Server::DB::SQLite3::dbsys_$cmd(\@ARGV)") }
-	else                { $result = eval("X2Go::Server::DB::SQLite3::db_$cmd(\@ARGV)") } 
+	case /.*listsessions.*root/              { @result_list = eval("X2Go::Server::DB::SQLite3::dbsys_$cmd(\@ARGV)") }
+	case /.*(listsessions|getmounts).*/      { @result_list = eval("X2Go::Server::DB::SQLite3::db_$cmd(\@ARGV)") }
+	case /.*root/                            { $result = eval("X2Go::Server::DB::SQLite3::dbsys_$cmd(\@ARGV)") }
+	else                                     { $result = eval("X2Go::Server::DB::SQLite3::db_$cmd(\@ARGV)") }
 }
 
 if ( defined(@result_list) )


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