x2goserver.git - master (branch) updated: 3.1.1.3-257-g1ca46bf - x2go-commits

30 Nov 2013

The branch, master has been updated
       via  1ca46bf891c11613ad6fec3296452403fcd320a2 (commit)
      from  ccb2ff2464a2dde4253517ed697c92b1358260d5 (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 1ca46bf891c11613ad6fec3296452403fcd320a2
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Sat Nov 30 22:24:19 2013 +0100

    Replace makepasswd by pwgen (because Fedora does not have makepasswd).
    
    Conflicts (resolved by Mike Gabriel):
    	debian/control

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog            |    1 +
 debian/control              |    1 +
 x2goserver/sbin/x2godbadmin |    4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index 9cde8f5..a5daf97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -207,6 +207,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@das-netzwerkteam.de>  Thu, 28 Nov 2013 16:14:32 +0100
 
diff --git a/debian/control b/debian/control
index 8596c89..59fa0cc 100644
--- a/debian/control
+++ b/debian/control
@@ -26,6 +26,7 @@ Depends:
  bc,
  openssh-client,
  openssh-server,
+ pwgen,
  xauth,
  psmisc,
  net-tools,
diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin
index f8dccbc..a31bf51 100755
--- a/x2goserver/sbin/x2godbadmin
+++ b/x2goserver/sbin/x2godbadmin
@@ -188,7 +188,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";
 
@@ -315,7 +315,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).

    