From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 10 Jan 2006 21:40:00 +0000 (+0000)
Subject: don't set webif password if the entered root password didn't match (#191)
X-Git-Tag: whiterussian_rc5~259
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=6a1044f113bd06d0ec219a2bb8042e262d0987b9;p=openwrt%2Fsvn-archive%2Fopenwrt.git

don't set webif password if the entered root password didn't match (#191)

SVN-Revision: 2888
---

diff --git a/openwrt/package/webif/files/usr/lib/webif/webif.sh b/openwrt/package/webif/files/usr/lib/webif/webif.sh
index dce57dd6c2..9208086ecb 100644
--- a/openwrt/package/webif/files/usr/lib/webif/webif.sh
+++ b/openwrt/package/webif/files/usr/lib/webif/webif.sh
@@ -119,8 +119,7 @@ EOF
 				echo "$FORM_passwd1"
 				sleep 1
 				echo "$FORM_passwd2"
-			) | passwd root
-			apply_passwd
+			) | passwd root && apply_passwd
 			echo '</pre>'
 			footer
 			exit