[X2Go-Commits] x2goserver.git - build-main (branch) updated: 4.0.1.9-7-ge56275b
X2Go dev team
git-admin at x2go.org
Wed Dec 4 06:12:51 CET 2013
The branch, build-main has been updated
via e56275bef74a77a68b54135f3a91025c7e8ef306 (commit)
from 346bfc6c985e7f5283cb8b82e65693db0b7bc94b (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 | 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 3a7117b..7ee7b6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -142,6 +142,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 eadc2eb..0170df5 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 a4f915c..2652e80 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";
@@ -317,7 +317,7 @@ sub add_user()
print "The super-user \"root\" is not allowed to use X2Go\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