summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-11-17 09:40:06 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-11-17 09:40:06 +0000
commitb668d3deb84d791f5ca5ecd5544658457c44b7b0 (patch)
tree79469742d04f3855467cdf69432f96fc7392001b
parente9531fc3c0bc6e62d896394c78f581f00b2a0905 (diff)
[package] base-files: another empty password check fix (#10440)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29208 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/base-files/Makefile2
-rwxr-xr-xpackage/base-files/files/bin/login.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index b93d2cb40..9b3745ba9 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=base-files
-PKG_RELEASE:=96
+PKG_RELEASE:=97
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
PKG_BUILD_DEPENDS:=opkg/host
diff --git a/package/base-files/files/bin/login.sh b/package/base-files/files/bin/login.sh
index 6682b022b..04b3fe250 100755
--- a/package/base-files/files/bin/login.sh
+++ b/package/base-files/files/bin/login.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# Copyright (C) 2006-2011 OpenWrt.org
-if ( ! grep -qs '^root::' /etc/shadow || \
+if ( ! grep -qs '^root:[!x]\?:' /etc/shadow || \
! grep -qs '^root:[!x]\?:' /etc/passwd ) && \
[ -z "$FAILSAFE" ]
then