x2goserver.git - backport-lenny (branch) updated: 3.0.99-2-377-g5b318d8 - x2go-commits

28 Nov 2011

The branch, backport-lenny has been updated
       via  5b318d8cffc4b3d7db3157b0818e9da8cad24ec9 (commit)
       via  94ad27ceef977e732fea0aa05e6f0e752d707b5d (commit)
      from  ae29f4874f078a72455418aff1db6db82693ab59 (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 5b318d8cffc4b3d7db3157b0818e9da8cad24ec9
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.

commit 94ad27ceef977e732fea0aa05e6f0e752d707b5d
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Mon Nov 28 08:47:06 2011 +0100

    Add psmisc package as dependency.

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

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

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index 2da8af7..379be86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ x2goserver (3.0.99.8-0~x2go-bpo1) unstable; urgency=low
   * Cherry-picked from upcoming version (3.0.99.9):
     - Fix for install stanzas in several Makefiles.
     - 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>  Sun, 20 Nov 2011 18:54:26 +0100
 
diff --git a/debian/control b/debian/control
index e4e0f5b..2d309cf 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,8 @@ Depends:
  libdbd-pg-perl,
  libdbd-sqlite3-perl,
  adduser,
- xauth
+ xauth,
+ psmisc
 Recommends:
  sshfs,
  x11-apps,
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).

    