Browse Source

base-files: another empty password check fix (#10440)

SVN-Revision: 29208
Jo-Philipp Wich 14 years ago
parent
commit
010e58d209
2 changed files with 2 additions and 2 deletions
  1. 1 1
      package/base-files/Makefile
  2. 1 1
      package/base-files/files/bin/login.sh

+ 1 - 1
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

+ 1 - 1
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