From ba2a49e9875eda489385e370bb9f2259779caa7b Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 2 Dec 2014 19:22:48 +0100
Subject: Tweaks and fixes

---
 modules/serversetup.inc.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'modules/serversetup.inc.php')

diff --git a/modules/serversetup.inc.php b/modules/serversetup.inc.php
index 93d373c1..37868308 100644
--- a/modules/serversetup.inc.php
+++ b/modules/serversetup.inc.php
@@ -125,9 +125,11 @@ class Page_ServerSetup extends Page
 		$this->currentMenu['defaultentry'] = Request::post('defaultentry', 'net');
 		$this->currentMenu['timeout'] = $timeout;
 		$this->currentMenu['custom'] = Request::post('custom', '');
-		$this->currentMenu['masterpassword'] = Request::post('masterpassword', '');
-		if (!preg_match('/^\$[1456]\$.+\$/', $this->currentMenu['masterpassword']))
-			$this->currentMenu['masterpassword'] = Crypto::hash6($this->currentMenu['masterpassword']);
+		$this->currentMenu['masterpasswordclear'] = Request::post('masterpassword', '');
+		if (empty($this->currentMenu['masterpasswordclear']))
+			$this->currentMenu['masterpassword'] = 'invalid';
+		else
+			$this->currentMenu['masterpassword'] = Crypto::hash6($this->currentMenu['masterpasswordclear']);
 		Property::setBootMenu($this->currentMenu);
 		$id = Trigger::ipxe();
 		Util::redirect('?do=ServerSetup&taskid=' . $id);
-- 
cgit v1.2.3-55-g7522