diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2011-11-14 19:02:01 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-11-14 19:02:01 +0000 |
| commit | a0481cfb26770fb2b8a8a7cd833baca2dac187fa (patch) | |
| tree | 81122dc43f5c4c0ddfbc71ff8652ffe70fa7d4a6 /package/base-files/files/bin | |
| parent | 8f83f4a62f542dafa9cf3b1000b826269ca6de30 (diff) | |
| download | master-187ad058-a0481cfb26770fb2b8a8a7cd833baca2dac187fa.tar.gz master-187ad058-a0481cfb26770fb2b8a8a7cd833baca2dac187fa.tar.bz2 master-187ad058-a0481cfb26770fb2b8a8a7cd833baca2dac187fa.zip | |
[package] base-files: prime root password with "x" to notify programs that there is a shadow record, fix /bin/login.sh password detection accordingly.
Solves broken key based dropbear login with empty password after r28935.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29130 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files/files/bin')
| -rwxr-xr-x | package/base-files/files/bin/login.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/package/base-files/files/bin/login.sh b/package/base-files/files/bin/login.sh index b46769a012..6682b022ba 100755 --- a/package/base-files/files/bin/login.sh +++ b/package/base-files/files/bin/login.sh @@ -1,7 +1,10 @@ #!/bin/sh # Copyright (C) 2006-2011 OpenWrt.org -if grep -qs '^root:[^!:]' /etc/passwd /etc/shadow && [ -z "$FAILSAFE" ]; then +if ( ! grep -qs '^root::' /etc/shadow || \ + ! grep -qs '^root:[!x]\?:' /etc/passwd ) && \ + [ -z "$FAILSAFE" ] +then echo "Login failed." exit 0 else |