[X2Go-Commits] [x2goserver] 01/01: x2goserver/sbin/x2godbadmin: exit earlier when not finding the required "x2gouser" user.

[git-admin at x2go.org]

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

x2go pushed a commit to branch release/4.0.1.x
in repository x2goserver.

commit aba1a0b31b95aba1d4eed20e546e26a9a13cf66a
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Oct 4 13:29:18 2016 +0200

    x2goserver/sbin/x2godbadmin: exit earlier when not finding the required "x2gouser" user.
---
 debian/changelog            |    2 ++
 x2goserver/sbin/x2godbadmin |    8 +-------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0647cf9..b9c7f99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -96,6 +96,8 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low
       Fixes: #1073.
     - x2goserver/sbin/x2gocleansessions: move in-file POD to end of file,
       rather than "commenting" out all the remaining code. Fixes: #1068.
+    - x2goserver/sbin/x2godbadmin: exit earlier when not finding the required
+      "x2gouser" user.
   * x2goserver.spec:
     - Add sudo and logcheck as BuildRequires and Requires. Don't own
       directories that are owned by sudo and logcheck. Logcheck is not
diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin
index 476e30a..254dc2c 100755
--- a/x2goserver/sbin/x2godbadmin
+++ b/x2goserver/sbin/x2godbadmin
@@ -65,15 +65,9 @@ $Config->read('/etc/x2go/x2gosql/sql' ) or die "Can't read config file /etc/x2go
 if ($Config->param("backend") eq 'sqlite')
 {
 	my $user="x2gouser";
-	my ($name, $pass, $uid, $pgid, $quota, $comment, $gcos, $dir, $shell, $expire) = getpwnam($user);
+	my ($name, $pass, $uid, $pgid, $quota, $comment, $gcos, $dir, $shell, $expire) = getpwnam($user) or die ("Can not find user ($user)\n");
 	my $dbfile="$dir/x2go_sessions";
 
-	if (! $uid)
-	{
-		print "Can not find user ($user)\n";
-		exit(-1);
-	}
-
 	if ($listusers|| $adduser||$addgroup||$rmuser||$rmgroup)
 	{
 		print "Only \"--createdb\" option is available with sqlite backend\n";

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