aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2011-11-16 13:17:35 +0000
committerJo-Philipp Wich <jow@openwrt.org>2011-11-16 13:17:35 +0000
commitcabbc9966c6b415f4bcff326f72ff029f9ddae22 (patch)
tree16d4d7622ecf912706ee041cf839a9c8d927c3ef
parent63820327d3b8d79e7b29d7b089d44670a72d9411 (diff)
downloadupstream-cabbc9966c6b415f4bcff326f72ff029f9ddae22.tar.gz
upstream-cabbc9966c6b415f4bcff326f72ff029f9ddae22.tar.bz2
upstream-cabbc9966c6b415f4bcff326f72ff029f9ddae22.zip
busybox: fix empty password detection in telnetd init (#10432)
SVN-Revision: 29183
-rw-r--r--package/busybox/Makefile2
-rwxr-xr-xpackage/busybox/files/telnet2
2 files changed, 2 insertions, 2 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index a8bb67ac29..7770a538e9 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=busybox
PKG_VERSION:=1.19.3
-PKG_RELEASE:=6
+PKG_RELEASE:=7
PKG_FLAGS:=essential
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/package/busybox/files/telnet b/package/busybox/files/telnet
index 334523eb9f..994e713e70 100755
--- a/package/busybox/files/telnet
+++ b/package/busybox/files/telnet
@@ -8,7 +8,7 @@ has_root_pwd() {
pwd="${pwd#*root:}"
pwd="${pwd%%:*}"
- test -n "${pwd#!}"
+ test -n "${pwd#[\!x]}"
}
get_root_home() {