x2goserver.git - master (branch) updated: 3.0.99.8-19-g4232386 - x2go-commits

28 Nov 2011

The branch, master has been updated
       via  42323861f27f8ffd215009765e61b1312707a58c (commit)
      from  c0fea2a62ddf6b0186305858853f927a4dff252a (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 42323861f27f8ffd215009765e61b1312707a58c
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Mon Nov 28 09:02:16 2011 +0100

    Fix x2godbadmin for Perl versions < 5.10.x.

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

Summary of changes:
 debian/changelog            |    1 +
 x2goserver/sbin/x2godbadmin |   12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index 50a25a0..0261825 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ x2goserver (3.0.99.9-0~x2go1) UNRELEASED; urgency=low
     - Desktop sharing: fix username of user who requests desktop sharing.
     - Allow client-side setting of session window title.
     - Fix x2gobasepath for Perl versions < 5.10.x.
+    - Fix x2godbadmin for Perl versions < 5.10.x.
   * Add psmisc package as dependency.
 
  -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Fri, 25 Nov 2011 11:38:46 +0100
diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin
index 441b176..d65d752 100755
--- a/x2goserver/sbin/x2godbadmin
+++ b/x2goserver/sbin/x2godbadmin
@@ -108,11 +108,13 @@ my $user="x2gouser";
 		                      unique(display))
 		                      ");
 		$sth->execute() or die;
+		$sth->finish();
 
 		my $sth=$dbh->prepare("
 		                      create table messages(mess_id varchar(20) primary key, message text)
 		                      ");
 		$sth->execute() or die;
+		$sth->finish();
 
 		my $sth=$dbh->prepare("
 		                      create table user_messages(
@@ -120,6 +122,7 @@ my $user="x2gouser";
 		                      uname varchar(100) not null)
 		                      ");
 		$sth->execute() or die;
+		$sth->finish();
 
 		my $sth=$dbh->prepare("
 		                      create table used_ports(
@@ -128,6 +131,7 @@ my $user="x2gouser";
 		                      port integer primary key)
 		                      ");
 		$sth->execute() or die;
+		$sth->finish();
 
 		my $sth=$dbh->prepare("
 		                      create table mounts(
@@ -137,6 +141,7 @@ my $user="x2gouser";
 		                      primary key(path,client))
 		                      ");
 		$sth->execute() or die;
+		$sth->finish();
 
 		my $sth=$dbh->prepare("
 		                      CREATE TRIGGER fkd_mounts_session_id
@@ -149,6 +154,7 @@ my $user="x2gouser";
 		                      END;
 		                      ");
 		$sth->execute() or die; 
+		$sth->finish();
 
 		my $sth=$dbh->prepare("
 		                      CREATE TRIGGER fkd_ports_session_id
@@ -160,9 +166,11 @@ my $user="x2gouser";
 		                      END;
 		                      ");
 		$sth->execute() or die; 
-
 		$sth->finish();
-		$dbh->disconnect();
+
+		# undef $dbh should be preferred to $dbh->disconnect(), see
+		# http://www.perlmonks.org/?node_id=665714
+		undef $dbh;
 		chmod(0770, "$dir");
 		chown('root',$pgid,"$dir");
 		chmod(0660, "$dbfile");


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

    