From 8f4acc30d07c2041d1f0ebd6724b5be2c7f0971e Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 12 Apr 2017 18:36:36 +0200
Subject: [PATCH] rc: finish root password reset; closes #1540

---
 src/etc/rc.initial.password | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/etc/rc.initial.password b/src/etc/rc.initial.password
index 7b7642d6a..8b7cb491d 100755
--- a/src/etc/rc.initial.password
+++ b/src/etc/rc.initial.password
@@ -59,19 +59,29 @@ if (!$admin_user) {
 
 $admin_user['name'] = 'root';
 $admin_user['scope'] = 'system';
-$admin_user['disabled'] = null;
+if (isset($admin_user['disabled'])) {
+    unset($admin_user['disabled']);
+}
 
 echo "\nType a new password: ";
 
+shell_exec('/bin/stty -echo');
 $password = chop(fgets($fp));
+shell_exec('/bin/stty echo');
+echo "\n";
 if (empty($password)) {
     echo "\nPassword cannot be empty.\n";
-
+    return;
 }
-echo 'Confirm new password: ';
+
+echo "Confirm new password: ";
+shell_exec('/bin/stty -echo');
 $confirm = chop(fgets($fp));
+shell_exec('/bin/stty echo');
+echo "\n";
 if ($password !== $confirm) {
     echo "\nPasswords do not match.\n";
+    return;
 }
 
 local_user_set_password($admin_user, $password);