Browse Source

netstart is used during system start, but also interactively.

Show proper error message if a regular user executes netstart.
Only do the privilege check if the id binary is available,
which might not be the case during diskless system startup.
ok deraadt, jasper, jca, krw, rpe (who wrote the same diff), sthen
OPENBSD_6_4
tb 6 years ago
parent
commit
4e809e852a
1 changed files with 8 additions and 1 deletions
  1. +8
    -1
      src/etc/netstart

+ 8
- 1
src/etc/netstart View File

@ -1,6 +1,6 @@
#!/bin/sh - #!/bin/sh -
# #
# $OpenBSD: netstart,v 1.198 2018/04/28 22:38:32 rpe Exp $
# $OpenBSD: netstart,v 1.199 2018/07/08 20:10:26 tb Exp $
# Turn off Strict Bourne shell mode. # Turn off Strict Bourne shell mode.
set +o sh set +o sh
@ -201,6 +201,13 @@ defaultroute() {
done done
} }
# Make sure the invoking user has the right privileges. Check for presence of
# id(1) to avoid problems with diskless setups.
if [[ -x /usr/bin/id ]] && (($(id -u) != 0)); then
echo "${0##*/}: need root privileges"
exit 1
fi
# Get network related vars from rc.conf using the parsing routine from rc.subr. # Get network related vars from rc.conf using the parsing routine from rc.subr.
FUNCS_ONLY=1 . /etc/rc.d/rc.subr FUNCS_ONLY=1 . /etc/rc.d/rc.subr
_rc_parse_conf _rc_parse_conf


Loading…
Cancel
Save