[X2Go-Commits] [x2goserver] 01/01: x2goserver/sbin/x2godbadmin: no need to specify or use database for list_users operation.

[git-admin at x2go.org]

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

x2go pushed a commit to branch feature/mysql-backend
in repository x2goserver.

commit d68585824ba3a01d2d276cadd53c4ac5cc8ce0b3
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Feb 24 00:29:31 2018 +0100

    x2goserver/sbin/x2godbadmin: no need to specify or use database for list_users operation.
---
 debian/changelog            | 2 ++
 x2goserver/sbin/x2godbadmin | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 17bb60c..fd52f40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -87,6 +87,8 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
     - x2goserver/sbin/x2godbadmin: update copyright header.
     - UNINSTALL: add reference to remove mysqladmin password file if
       uninstalling the tarball manually.
+    - x2goserver/sbin/x2godbadmin: no need to specify or use database for
+      list_users operation.
   * debian/{control,compat}:
     + Bump DH compat level to 9.
   * debian/:
diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin
index b483ecc..75761ec 100755
--- a/x2goserver/sbin/x2godbadmin
+++ b/x2goserver/sbin/x2godbadmin
@@ -922,7 +922,7 @@ sub list_users()
 	}
 	elsif ($Config->param("backend") eq 'mysql')
 	{
-		mysql_list_users($host, $port, $dbadmin, $dbadminpass, $db);
+		mysql_list_users($host, $port, $dbadmin, $dbadminpass);
 	}
 	else
 	{
@@ -960,7 +960,7 @@ sub mysql_list_users()
 	my $dbadmin = shift or die "No dbadmin parameter supplied";
 	my $dbadminpass = shift or die "No dbadminpass (database administrator password) parameter supplied";
 
-	my $dbh=DBI->connect("dbi:mysql:database=$db;host=$host;port=$port", "$dbadmin", "$dbadminpass", {AutoCommit => 1}) or die $_;
+	my $dbh=DBI->connect("dbi:mysql:host=$host;port=$port", "$dbadmin", "$dbadminpass", {AutoCommit => 1}) or die $_;
 	my $sth=$dbh->prepare("select user from mysql.user where user like 'x2gouser_%'");
 	$sth->execute()or die;
 	printf ("%-20s DB user\n","UNIX user");

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git