From 55ec511c4636bb1c07ea2fe34e01883f5229e072 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Fri, 11 Oct 2013 11:33:27 +0200
Subject: [PATCH] Cleanup database migrate fragment

---
 .../e-smith/db/configuration/migrate/phplist-database    | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/root/etc/e-smith/db/configuration/migrate/phplist-database b/root/etc/e-smith/db/configuration/migrate/phplist-database
index 3d78aea..28d0ee4 100644
--- a/root/etc/e-smith/db/configuration/migrate/phplist-database
+++ b/root/etc/e-smith/db/configuration/migrate/phplist-database
@@ -2,32 +2,26 @@
     my $rec = $DB->get('phplist')
         || $DB->new_record('phplist', {type => 'webapp'});
     my $pw = $rec->prop('DbPassword');
-    if (not $pw or length($pw) < 57)
-    {   
+    if (not $pw or length($pw) < 57){
         use MIME::Base64 qw(encode_base64);
 
         $pw = "not set due to error";
-        if ( open( RANDOM, "/dev/urandom" ) )
-        {   
+        if ( open( RANDOM, "/dev/urandom" ) ){
             my $buf;
             # 57 bytes is a full line of Base64 coding, and contains
             # 456 bits of randomness - given a perfectly random /dev/random
-            if ( read( RANDOM, $buf, 57 ) != 57 )
-            {   
+            if ( read( RANDOM, $buf, 57 ) != 57 ){
                 warn("Short read from /dev/random: $!");
             }
-            else
-            {   
+            else{
                 $pw = encode_base64($buf);
                 chomp $pw;
             }
             close RANDOM;
         }
-        else
-        {   
+        else{
             warn "Could not open /dev/urandom: $!";
         }
         $rec->set_prop('DbPassword', $pw);
     }
 }
-