From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 8 Jan 2006 18:10:40 +0000 (+0000)
Subject: Merged enhancements submitted by Stereo, thanks, closes #188 and #189
X-Git-Tag: reboot~31335
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4fb752fea6816787478563d958a4d33be03454a4;p=openwrt%2Fstaging%2Fnoltari.git

Merged enhancements submitted by Stereo, thanks, closes #188 and #189

SVN-Revision: 2863
---

diff --git a/openwrt/package/base-files/default/etc/init.d/S50telnet b/openwrt/package/base-files/default/etc/init.d/S50telnet
index 599c3540eb..e7d4d36773 100755
--- a/openwrt/package/base-files/default/etc/init.d/S50telnet
+++ b/openwrt/package/base-files/default/etc/init.d/S50telnet
@@ -1,2 +1,2 @@
 #!/bin/sh
-telnetd -l /bin/login
+if awk -F: '/^root:/ && $2 !~ /\*/ {exit 1}' /etc/passwd 2>/dev/null || test $FAILSAFE; then telnetd -l /bin/login; fi
diff --git a/openwrt/package/openntpd/files/ntpd.init b/openwrt/package/openntpd/files/ntpd.init
index e528748780..8bac705b4a 100644
--- a/openwrt/package/openntpd/files/ntpd.init
+++ b/openwrt/package/openntpd/files/ntpd.init
@@ -1,3 +1,3 @@
 #!/bin/sh
-mkdir -p `grep "^ntp:" /etc/passwd | cut -d: -f6`
+mkdir -p `awk -F: '/^ntp:/{print $6}' /etc/passwd`
 /usr/sbin/ntpd -s