From cc74ba9c397335cac270cc711d49a4defaa774c1 Mon Sep 17 00:00:00 2001 From: florian Date: Sun, 8 Jan 2006 18:10:40 +0000 Subject: [PATCH] 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 --- openwrt/package/base-files/default/etc/init.d/S50telnet | 2 +- openwrt/package/openntpd/files/ntpd.init | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openwrt/package/base-files/default/etc/init.d/S50telnet b/openwrt/package/base-files/default/etc/init.d/S50telnet index 599c3540e..e7d4d3677 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 e52874878..8bac705b4 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