This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 6723b05 x2goserver/sbin/x2gocleansessions: add -d short parameter for enabling debugging capabilities to POD. new 7bd5381 x2goserver/sbin/x2godbadmin: exit earlier when not finding the required "x2gouser" user. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 ++ x2goserver/sbin/x2godbadmin | 8 +------- 2 files changed, 3 insertions(+), 7 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 7bd53813da9d37d49a0aeb7e3842e8cbc6833c15 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Oct 4 13:29:18 2016 +0200 x2goserver/sbin/x2godbadmin: exit earlier when not finding the required "x2gouser" user. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 2 ++ x2goserver/sbin/x2godbadmin | 8 +------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 859d660..83053ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -329,6 +329,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 d4f3972..d3c6266 100755 --- a/x2goserver/sbin/x2godbadmin +++ b/x2goserver/sbin/x2godbadmin @@ -66,15 +66,9 @@ my $Config = get_sqlconfig(); 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\" and \"--updatedb\" options are available with SQLite3 backend\n"; -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org