[X2Go-Commits] x2goserver.git - release/4.0.0.x (branch) updated: 4.0.0.7-3-g80162a9
X2Go dev team
git-admin at x2go.org
Sat Nov 30 22:27:39 CET 2013
The branch, release/4.0.0.x has been updated
via 80162a9e02734a9c9e1770b03445478d30860f28 (commit)
from cb5fd26dadd864dde1887dbecd6dd6293f086fb3 (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 -----------------------------------------------------------------
commit 80162a9e02734a9c9e1770b03445478d30860f28
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sat Nov 30 22:24:19 2013 +0100
Replace makepasswd by pwgen (because Fedora does not have makepasswd).
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
debian/control | 2 +-
x2goserver/sbin/x2godbadmin | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 55d5a60..b39bfac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ x2goserver (4.0.0.8-0x2go1) UNRELEASED; urgency=low
* Use mktemp instead of tempfile (because Fedora does not have the tempfile
binary). (Fixes: #347).
+ * Replace makepasswd by pwgen (because Fedora does not have makepasswd).
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Thu, 28 Nov 2013 16:14:32 +0100
diff --git a/debian/control b/debian/control
index 44f3789..30b1c82 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Depends:
openssh-client,
openssh-server,
libconfig-simple-perl,
- makepasswd,
+ pwgen,
libdbd-pg-perl,
libdbd-sqlite3-perl,
libfile-basedir-perl,
diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin
index 0ea113c..fa34b56 100755
--- a/x2goserver/sbin/x2godbadmin
+++ b/x2goserver/sbin/x2godbadmin
@@ -190,7 +190,7 @@ if (!$sslmode)
}
my $dbadmin=$Config->param("postgres.dbadmin");
my $x2goadmin="x2godbuser";
-my $x2goadminpass=`makepasswd`;
+my $x2goadminpass=`pwgen 8 1`;
chomp ($x2goadminpass);
my $db="x2go_sessions";
@@ -314,7 +314,7 @@ sub add_user()
print "Can not find user ($user)\n";
return;
}
- $pass=`makepasswd`;
+ $pass=`pwgen 8 1`;
chomp($pass);
my $sth=$dbh->prepare("DROP OWNED BY \"x2gouser_$user\"");
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