aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-07-18 18:36:12 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-07-18 18:36:12 +0000
commitc7f651009e0df6a117bf7c6a726440a8963e251b (patch)
treeb21b76cda5df920295ec1dc7230ec75eea5617fb /package/base-files
parentb98d2df29574ff92346b7aa05da132be39c8daaa (diff)
downloadupstream-c7f651009e0df6a117bf7c6a726440a8963e251b.tar.gz
upstream-c7f651009e0df6a117bf7c6a726440a8963e251b.tar.bz2
upstream-c7f651009e0df6a117bf7c6a726440a8963e251b.zip
[package] base-files, busybox: fix 22279, simplify code and get rid of awk
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22282 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files')
-rwxr-xr-xpackage/base-files/files/bin/login.sh21
1 files changed, 6 insertions, 15 deletions
diff --git a/package/base-files/files/bin/login.sh b/package/base-files/files/bin/login.sh
index 00f2f81ab4..a64c84e1e2 100755
--- a/package/base-files/files/bin/login.sh
+++ b/package/base-files/files/bin/login.sh
@@ -1,25 +1,16 @@
#!/bin/sh
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
-
-regpassresult="0"
-grep '^root:[^!]' /etc/passwd >&- 2>&-
-regpassresult="$?"
-shadowresult="0"
-if [ -e "/etc/shadow" ]; then
- grep '^root:[^!]' /etc/shadow >&- 2>&-
- shadowresult="$?"
-fi
-[ "$regpassresult" = "0" ] && [ "$shadowresult" = "0" ] && [ -z "$FAILSAFE" ] && {
- echo "Login failed."
- exit 0
-} || {
+if grep -qs '^root:[^!]' /etc/passwd /etc/shadow && [ -z "$FAILSAFE" ]; then
+ echo "Login failed."
+ exit 0
+else
cat << EOF
=== IMPORTANT ============================
Use 'passwd' to set your login password
this will disable telnet and enable SSH
------------------------------------------
EOF
-}
+fi
exec /bin/ash --login