[X2Go-Commits] [x2goserver] 01/01: Make sure to return "1" in X2Go::Server::DB Perl functions that don't return anything by default.

git-admin at x2go.org git-admin at x2go.org
Wed Feb 4 21:24:57 CET 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit b1a68e0e527b382cd4f1627255c42e8f61f2000e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Feb 4 21:20:56 2015 +0100

    Make sure to return "1" in X2Go::Server::DB Perl functions that don't return anything by default.
---
 X2Go/Server/DB/PostgreSQL.pm |   10 ++++++++++
 X2Go/Server/DB/SQLite3.pm    |    7 +++++++
 debian/changelog             |    1 +
 3 files changed, 18 insertions(+)

diff --git a/X2Go/Server/DB/PostgreSQL.pm b/X2Go/Server/DB/PostgreSQL.pm
index 89bc125..45c3d4e 100644
--- a/X2Go/Server/DB/PostgreSQL.pm
+++ b/X2Go/Server/DB/PostgreSQL.pm
@@ -120,6 +120,7 @@ sub dbsys_rmsessionsroot
 	$sth->execute() or die;
 	$sth->finish();
 	undef $dbh;
+	return 1;
 }
 
 sub dbsys_deletemounts
@@ -131,6 +132,7 @@ sub dbsys_deletemounts
 	$sth->execute();
 	$sth->finish();
 	undef $dbh;
+	return 1;
 }
 
 sub dbsys_listsessionsroot
@@ -248,6 +250,7 @@ sub db_deletemount
 	$sth->execute();
 	$sth->finish();
 	undef $dbh;
+	return 1;
 }
 
 sub db_insertmount
@@ -283,6 +286,7 @@ sub db_insertsession
 	$sth->execute()or die $_;
 	$sth->finish();
 	undef $dbh;
+	return 1;
 }
 
 sub db_insertshadowsession
@@ -299,6 +303,7 @@ sub db_insertshadowsession
 	$sth->execute()or die $_;
 	$sth->finish();
 	undef $dbh;
+	return 1;
 }
 
 sub db_createsession
@@ -337,6 +342,7 @@ sub db_createsession
 	$sth->execute() or die;
 	$sth->finish();
 	undef $dbh;
+	return 1;
 }
 
 sub db_insertport
@@ -351,6 +357,7 @@ sub db_insertport
 	$sth->execute()or die;
 	$sth->finish();
 	undef $dbh;
+	return 1;
 }
 
 sub db_rmport
@@ -365,6 +372,7 @@ sub db_rmport
 	$sth->execute()or die;
 	$sth->finish();
 	undef $dbh;
+	return 1;
 }
 
 sub db_resume
@@ -396,6 +404,7 @@ sub db_resume
 	$sth->execute()or die;
 	$sth->finish();
 	undef $dbh;
+	return 1;
 }
 
 sub db_changestatus
@@ -409,6 +418,7 @@ sub db_changestatus
 	$sth->execute()or die;
 	$sth->finish();
 	undef $dbh;
+	return 1;
 }
 
 sub db_getstatus
diff --git a/X2Go/Server/DB/SQLite3.pm b/X2Go/Server/DB/SQLite3.pm
index 35d0e88..65446ac 100644
--- a/X2Go/Server/DB/SQLite3.pm
+++ b/X2Go/Server/DB/SQLite3.pm
@@ -83,6 +83,7 @@ sub dbsys_rmsessionsroot
 	}
 	$sth->finish();
 	undef $dbh;
+	return 1;
 }
 
 sub dbsys_listsessionsroot
@@ -149,6 +150,7 @@ sub dbsys_deletemounts
 	}
 	$sth->finish();
 	undef $dbh;
+	return 1;
 }
 
 sub db_getmounts
@@ -187,6 +189,7 @@ sub db_deletemount
 	}
 	$sth->finish();
 	undef $dbh;
+	return 1;
 }
 
 sub db_insertmount
@@ -328,6 +331,7 @@ sub db_insertport
 	}
 	$sth->finish();
 	undef $dbh;
+	return 1;
 }
 
 sub db_rmport
@@ -346,6 +350,7 @@ sub db_rmport
 	}
 	$sth->finish();
 	undef $dbh;
+	return 1;
 }
 
 sub db_resume
@@ -375,6 +380,7 @@ sub db_resume
 	}
 	$sth->finish();
 	undef $dbh;
+	return 1;
 }
 
 sub db_changestatus
@@ -394,6 +400,7 @@ sub db_changestatus
 	}
 	$sth->finish();
 	undef $dbh;
+	return 1;
 }
 
 sub db_getstatus
diff --git a/debian/changelog b/debian/changelog
index 386f28a..2d43afd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -216,6 +216,7 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium
     - Fix wrong evocation of x2gosyslog ("error" -> "err").
     - Use "undef $dbh" instead of "$dbh->disconnect()". Fixes SQLite3 issues on
       SLE 11.x.
+    - Make sure to always return "1" in X2Go Server DB Perl functions.
   * debian/control:
     + Add D (x2goserver): libfile-which-perl.
     + Add C (x2goserver: x2godesktopsharing (<< 3.1.1.2-0~). (Fixes: #700).

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git


More information about the x2go-commits mailing list