[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.0.99.9-6-ge887a2b
X2Go dev team
git-admin at x2go.org
Fri Jan 3 18:04:37 CET 2014
The branch, build-baikal has been updated
via e887a2beb7d4d82f9401ebf219f6e13f38635114 (commit)
from b94b429b96daf3afa71d83aca582a7de66f45495 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 4 ++++
x2goserver/sbin/x2godbadmin | 18 +++++++++---------
2 files changed, 13 insertions(+), 9 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index d44e1f7..6d568a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ x2goserver (3.0.99.10-0~x2go1) UNRELEASED; urgency=low
* New upstream version (3.0.99.10):
- Replace all string ,,X2Go.' with ,,X2Go''.
+ [ Jochen Schulz ]
+ * New upstream version (3.0.99.10):
+ - Escape DB user names in x2godbadmin.
+
[ John Williams ]
* New upstream version (3.0.99.10):
- Fix xserver-xsession/Makefile: add missing $(DESTDIR) expressions.
diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin
index 1c4e6be..84dfc5d 100755
--- a/x2goserver/sbin/x2godbadmin
+++ b/x2goserver/sbin/x2godbadmin
@@ -284,12 +284,12 @@ sub rm_user()
{
my $user=shift;
- print ("rm DB user x2gouser_$user\n");
+ print ("rm DB user \"x2gouser_$user\"\n");
- my $sth=$dbh->prepare("DROP OWNED BY x2gouser_$user");
+ my $sth=$dbh->prepare("DROP OWNED BY \"x2gouser_$user\"");
$sth->execute();
- my $sth=$dbh->prepare("drop USER if exists x2gouser_$user");
+ my $sth=$dbh->prepare("drop USER if exists \"x2gouser_$user\"");
$sth->execute();
$sth->finish();
@@ -316,24 +316,24 @@ sub add_user()
$pass=`makepasswd`;
chomp($pass);
- my $sth=$dbh->prepare("DROP OWNED BY x2gouser_$user");
+ my $sth=$dbh->prepare("DROP OWNED BY \"x2gouser_$user\"");
$sth->{Warn}=0;
$sth->{PrintError}=0;
$sth->execute();
- $sth=$dbh->prepare("drop USER if exists x2gouser_$user");
+ $sth=$dbh->prepare("drop USER if exists \"x2gouser_$user\"");
$sth->{Warn}=0;
$sth->{PrintError}=0;
$sth->execute();
- print ("create DB user x2gouser_$user\n");
- $sth=$dbh->prepare("create USER x2gouser_$user WITH ENCRYPTED PASSWORD '$pass'");
+ print ("create DB user \"x2gouser_$user\"\n");
+ $sth=$dbh->prepare("create USER \"x2gouser_$user\" WITH ENCRYPTED PASSWORD '$pass'");
$sth->execute();
- $sth=$dbh->prepare("GRANT INSERT, UPDATE, DELETE ON sessions, used_ports, mounts TO x2gouser_$user");
+ $sth=$dbh->prepare("GRANT INSERT, UPDATE, DELETE ON sessions, used_ports, mounts TO \"x2gouser_$user\"");
$sth->execute();
- $sth=$dbh->prepare("GRANT SELECT, UPDATE, DELETE ON sessions_view, mounts_view, servers_view, ports_view TO x2gouser_$user");
+ $sth=$dbh->prepare("GRANT SELECT, UPDATE, DELETE ON sessions_view, mounts_view, servers_view, ports_view TO \"x2gouser_$user\"");
$sth->execute();
$sth->finish();
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).
More information about the x2go-commits
mailing list