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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2863 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/openwrt/package/base-files/default/etc/init.d/S50telnet b/openwrt/package/base-files/default/etc/init.d/S50telnet
index 599c354..e7d4d36 100755 (executable)
--- 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
 #!/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 e528748..8bac705 100644 (file)
--- a/openwrt/package/openntpd/files/ntpd.init
+++ b/openwrt/package/openntpd/files/ntpd.init
@@ -1,3 +1,3 @@
 #!/bin/sh
 #!/bin/sh

-mkdir -p `grep "^ntp:" /etc/passwd | cut -d: -f6`
+mkdir -p `awk -F: '/^ntp:/{print $6}' /etc/passwd`

 /usr/sbin/ntpd -s
 /usr/sbin/ntpd -s