aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2016-09-26 15:25:37 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2016-09-26 17:57:56 +0200
commit6c1542787d135de358710254e71fe926f8676954 (patch)
treef6d3b832e9ef6e9074745cd6b02cf4f77b147a83 /package/base-files
parent77f54eae453db4220547c4c17d29ff91351b06e0 (diff)
downloadupstream-6c1542787d135de358710254e71fe926f8676954.tar.gz
upstream-6c1542787d135de358710254e71fe926f8676954.tar.bz2
upstream-6c1542787d135de358710254e71fe926f8676954.zip
base-files: fix check for empty password warning
Now that we know that the password is in /etc/shadow and not in /etc/passwd, we can properly fix the logic for the empty password check. Only 'root::' is an empty password, 'root:x:' and 'root:!:' allow no password login at all. This fixes the empty password warning still showing after the root password has been locked using 'passwd -l root' (e.g. to allow public-key auth only). Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
Diffstat (limited to 'package/base-files')
-rw-r--r--package/base-files/files/etc/profile3
1 files changed, 1 insertions, 2 deletions
diff --git a/package/base-files/files/etc/profile b/package/base-files/files/etc/profile
index d70bafca49..f241ab2ef3 100644
--- a/package/base-files/files/etc/profile
+++ b/package/base-files/files/etc/profile
@@ -30,8 +30,7 @@ alias ll='ls -alF --color=auto'
unset FILE
}
-if ( grep -qsE '^root:[!x]?:' /etc/shadow && \
- grep -qsE '^root:[!x]?:' /etc/passwd && \
+if ( grep -qs '^root::' /etc/shadow && \
[ -z "$FAILSAFE" ] )
then
cat << EOF