From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 16 Nov 2011 13:17:35 +0000 (+0000)
Subject: busybox: fix empty password detection in telnetd init (#10432)
X-Git-Tag: reboot~15491
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=cabbc9966c6b415f4bcff326f72ff029f9ddae22;p=openwrt%2Fstaging%2Fblogic.git

busybox: fix empty password detection in telnetd init (#10432)

SVN-Revision: 29183
---

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index a8bb67ac2967..7770a538e9b2 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 334523eb9fd4..994e713e704f 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() {