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

SVN-Revision: 2863
2006-01-08 18:10:40 +00:00 · 2006-01-08 18:10:40 +00:00 · 4fb752fea6
commit 4fb752fea6
parent 3dbd25eba7
2 changed files with 2 additions and 2 deletions
--- 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
--- 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
`@ -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`