From 009f476425350ff40019ea24a676c0e4a034c50c Mon Sep 17 00:00:00 2001 From: sthen <> Date: Thu, 14 Aug 2008 00:59:50 +0000 Subject: [PATCH] Tools from /usr may not be used in netstart since it may be NFS-mounted and not available at that time. Rewrite the hostname.if permission check to use only /bin/ls and the shell. Requested by deraadt. ok todd, "Twisted." deraadt --- src/etc/netstart | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/etc/netstart b/src/etc/netstart index 4ac1ec04..f780259a 100644 --- a/src/etc/netstart +++ b/src/etc/netstart @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: netstart,v 1.122 2008/07/23 16:05:47 sthen Exp $ +# $OpenBSD: netstart,v 1.123 2008/08/14 00:59:50 sthen Exp $ # Strip comments (and leading/trailing whitespace if IFS is set) # from a file and spew to stdout @@ -40,7 +40,9 @@ ifstart() { echo "netstart: $file: No such file or directory" return fi - if [ "$(stat -Lf "%SLp %u %g" $file)" != "--- 0 0" ]; then + # Not using stat(1), we can't rely on having /usr yet + set -A stat -- `ls -nL $file` + if [ "${stat[0]#???????} ${stat[2]} ${stat[3]}" != "--- 0 0" ]; then echo "WARNING: $file is insecure, fixing permissions" chmod -LR o-rwx $file chown -LR root.wheel $file