summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-01-08 18:10:40 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-01-08 18:10:40 +0000
commitae4bdf080e894355601f6d02593b34f662ab41e5 (patch)
tree797d1af5e1811a9b0e7762fadf782cdf19b96b61
parent96d64448ce1d265c8d4719bf4221f15b21c37dac (diff)
Merged enhancements submitted by Stereo, thanks, closes #188 and #189
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2863 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xpackage/base-files/default/etc/init.d/S50telnet2
-rw-r--r--package/openntpd/files/ntpd.init2
2 files changed, 2 insertions, 2 deletions
diff --git a/package/base-files/default/etc/init.d/S50telnet b/package/base-files/default/etc/init.d/S50telnet
index 599c3540e..e7d4d3677 100755
--- a/package/base-files/default/etc/init.d/S50telnet
+++ b/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/package/openntpd/files/ntpd.init b/package/openntpd/files/ntpd.init
index e52874878..8bac705b4 100644
--- a/package/openntpd/files/ntpd.init
+++ b/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