From 8397f27caa34ab83a9e4546a10800cffea4397f2 Mon Sep 17 00:00:00 2001
From: Bob Gilligan <gilligan@vyatta.com>
Date: Thu, 25 Sep 2008 11:34:43 -0700
Subject: Bugfix: 3515 Accept an encrypted-password field with or without a
 trailing colon character.

---
 scripts/standalone_root_pw_reset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/standalone_root_pw_reset')

diff --git a/scripts/standalone_root_pw_reset b/scripts/standalone_root_pw_reset
index 336d534d..65af7e55 100755
--- a/scripts/standalone_root_pw_reset
+++ b/scripts/standalone_root_pw_reset
@@ -76,7 +76,7 @@ usermod --password "$newpwd" root
 # escape / in encrypted passwd
 pw=$(echo $newpwd | sed 's:/:\\/:g')
 sed -i \
-    -e "/^.* user root {/,/}/s/encrypted-password .*\$/encrypted-password \"$pw\"/" \
+    -e "/^.* user root {/,/}/s/encrypted-password:* .*\$/encrypted-password \"$pw\"/" \
     $CF
 
 echo $(date "+%b%e %T") $(hostname) "Root password reset to factory value" \
-- 
cgit v1.2.3