Fincer
/
openntpd-openbsd
mirror of https://github.com/Fincer/openntpd-openbsd
1
0
Fork 0
Code Issues 0 Projects 0 Releases 61 Wiki Activity
Browse Source

Make rc.conf a parsed configuration file and stop sourcing it as a shell 

script.
From now on rc.conf has a fixed syntax (key=val) and it is not allowed
to add anything to it besides the supported syntax, it all going to be
ignored.
discussed with and help from deraadt@ and halex@
OPENBSD_5_6
robert 10 years ago
parent
bc2478c0da
commit
e7fd0565a5
4 changed files with 134 additions and 97 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +4
    -3
      src/etc/netstart
  2. +6
    -3
      src/etc/rc
  3. +6
    -29
      src/etc/rc.conf
  4. +118
    -62
      src/etc/rc.d/rc.subr

+ 4
- 3
src/etc/netstart View File

@ -1,6 +1,6 @@
#!/bin/sh - #!/bin/sh -
# #
# $OpenBSD: netstart,v 1.139 2013/08/22 07:53:11 mpi Exp $
# $OpenBSD: netstart,v 1.140 2014/07/12 10:14:03 robert Exp $
# Strip comments (and leading/trailing whitespace if IFS is set) # Strip comments (and leading/trailing whitespace if IFS is set)
# from a file and spew to stdout # from a file and spew to stdout
@ -148,8 +148,9 @@ ifmstart() {
done done
} }
# Re-read /etc/rc.conf
. /etc/rc.conf
# re-read rc.subr if we are not inside /etc/rc
[ -n ${INRC} ] && FUNCS_ONLY=1 . /etc/rc.d/rc.subr
_rc_parse_conf
# If we were invoked with a list of interface names, just reconfigure these # If we were invoked with a list of interface names, just reconfigure these
# interfaces (or bridges) and return. # interfaces (or bridges) and return.


+ 6
- 3
src/etc/rc View File

@ -1,4 +1,4 @@
# $OpenBSD: rc,v 1.427 2014/04/25 17:59:53 bluhm Exp $
# $OpenBSD: rc,v 1.428 2014/07/12 10:14:03 robert Exp $
# System startup script run by init on autoboot # System startup script run by init on autoboot
# or after single-user. # or after single-user.
@ -224,8 +224,11 @@ if [ -f /etc/defaultdomain ]; then
domainname `stripcom /etc/defaultdomain` domainname `stripcom /etc/defaultdomain`
fi fi
# pick up option configuration
. /etc/rc.conf
# need to get local functions from rc.subr
FUNCS_ONLY=1 . /etc/rc.d/rc.subr
# load rc.conf into scope
_rc_parse_conf
if [ X"$1" = X"shutdown" ]; then if [ X"$1" = X"shutdown" ]; then
random_seed random_seed


+ 6
- 29
src/etc/rc.conf View File

@ -1,6 +1,4 @@
#!/bin/sh -
#
# $OpenBSD: rc.conf,v 1.191 2014/07/11 21:58:32 tedu Exp $
# $OpenBSD: rc.conf,v 1.192 2014/07/12 10:14:03 robert Exp $
# DO NOT EDIT THIS FILE!! # DO NOT EDIT THIS FILE!!
# #
@ -24,7 +22,7 @@ bgpd_flags=NO # for normal use: ""
rarpd_flags=NO # for normal use: "-a" rarpd_flags=NO # for normal use: "-a"
bootparamd_flags=NO # for normal use: "" bootparamd_flags=NO # for normal use: ""
rbootd_flags=NO # for normal use: "" rbootd_flags=NO # for normal use: ""
sshd_flags="" # for normal use: ""
sshd_flags= # for normal use: ""
named_flags=NO # for normal use: "" named_flags=NO # for normal use: ""
nsd_flags=NO # for normal use: "-c /var/nsd/etc/nsd.conf" nsd_flags=NO # for normal use: "-c /var/nsd/etc/nsd.conf"
unbound_flags=NO # for normal use: "-c /var/unbound/etc/unbound.conf" unbound_flags=NO # for normal use: "-c /var/unbound/etc/unbound.conf"
@ -54,8 +52,8 @@ hostapd_flags=NO # for normal use: ""
ifstated_flags=NO # for normal use: "" ifstated_flags=NO # for normal use: ""
relayd_flags=NO # for normal use: "" relayd_flags=NO # for normal use: ""
snmpd_flags=NO # for normal use: "" snmpd_flags=NO # for normal use: ""
smtpd_flags="" # for normal use: ""
sndiod_flags="" # for normal use: ""
smtpd_flags= # for normal use: ""
sndiod_flags= # for normal use: ""
ldapd_flags=NO # for normal use: "" ldapd_flags=NO # for normal use: ""
npppd_flags=NO # for normal use: "" npppd_flags=NO # for normal use: ""
inetd_flags=NO # for normal use: "" inetd_flags=NO # for normal use: ""
@ -66,7 +64,7 @@ tftpd_flags=NO # for normal use: "[chroot dir]"
tftpproxy_flags=NO # for normal use: "" tftpproxy_flags=NO # for normal use: ""
ldomd_flags=NO # for normal use: "" ldomd_flags=NO # for normal use: ""
identd_flags=NO # for normal use: "-e" identd_flags=NO # for normal use: "-e"
cron_flags="" # for normal use: ""
cron_flags= # for normal use: ""
# use -u to disable chroot, see nginx(8) # use -u to disable chroot, see nginx(8)
nginx_flags=NO # for normal use: "" nginx_flags=NO # for normal use: ""
@ -76,7 +74,7 @@ slowcgi_flags=NO # for normal use: ""
sendmail_flags=NO sendmail_flags=NO
spamd_flags=NO # for normal use: "" and see spamd(8) spamd_flags=NO # for normal use: "" and see spamd(8)
spamd_black=NO # set to YES to run spamd without greylisting spamd_black=NO # set to YES to run spamd without greylisting
spamlogd_flags="" # use eg. "-i interface" and see spamlogd(8)
spamlogd_flags= # use eg. "-i interface" and see spamlogd(8)
# Set to NO if ftpd is running out of inetd # Set to NO if ftpd is running out of inetd
ftpd_flags=NO # for non-inetd use: "" ftpd_flags=NO # for non-inetd use: ""
@ -119,24 +117,3 @@ shlib_dirs= # extra directories for ldconfig, separated
# rc.d(8) packages scripts # rc.d(8) packages scripts
# started in the specified order and stopped in reverse order # started in the specified order and stopped in reverse order
pkg_scripts= pkg_scripts=
unset mountd_flags nfsd_flags ypbind_flags
[ -f /etc/rc.conf.local ] && . /etc/rc.conf.local
# special care needed for spamlogd to avoid starting it up and failing
# all the time
if [ X"${spamd_flags}" = X"NO" -o X"${spamd_black}" != X"NO" ]; then
spamlogd_flags=NO
fi
# special care needed for pflogd to avoid starting it up and failing
# if pf is not enabled
if [ X"${pf}" = X"NO" ]; then
pflogd_flags=NO
fi
# backward compatibility
: ${mountd_flags=$([ X"${nfs_server-NO}" = XYES ] || echo NO)}
: ${nfsd_flags=$([ X"${nfs_server-NO}" = XYES ] && echo "-tun 4" || echo NO)}
: ${ypbind_flags=$([ X"`domainname`" != X"" -a -d /var/yp/binding ] || echo NO)}

+ 118
- 62
src/etc/rc.d/rc.subr View File

@ -1,8 +1,8 @@
# $OpenBSD: rc.subr,v 1.72 2014/07/09 14:19:22 ajacoutot Exp $
# $OpenBSD: rc.subr,v 1.73 2014/07/12 10:14:03 robert Exp $
# #
# Copyright (c) 2010, 2011, 2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 2010, 2011, 2014 Antoine Jacoutot <ajacoutot@openbsd.org>
# Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org> # Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
# Copyright (c) 2010, 2011 Robert Nagy <robert@openbsd.org>
# Copyright (c) 2010, 2011, 2014 Robert Nagy <robert@openbsd.org>
# #
# Permission to use, copy, modify, and distribute this software for any # Permission to use, copy, modify, and distribute this software for any
# purpose with or without fee is hereby granted, provided that the above # purpose with or without fee is hereby granted, provided that the above
@ -19,57 +19,41 @@
# Default functions and variables used by rc.d(8) scripts. # Default functions and variables used by rc.d(8) scripts.
rc_err() {
_rc_err() {
echo $1 1>&2 echo $1 1>&2
exit 1 exit 1
} }
rc_is_supported() {
_rc_is_supported() {
local _enotsup local _enotsup
eval _enotsup=\${rc_$1} eval _enotsup=\${rc_$1}
[ X"${_enotsup}" != X"NO" ] [ X"${_enotsup}" != X"NO" ]
} }
rc_usage() {
_rc_usage() {
local _a _allsup local _a _allsup
for _a in start stop restart reload check; do for _a in start stop restart reload check; do
rc_is_supported ${_a} && _allsup="${_allsup:+$_allsup|}${_a}"
_rc_is_supported ${_a} && _allsup="${_allsup:+$_allsup|}${_a}"
done done
rc_err "usage: $0 [-df] (${_allsup})"
_rc_err "usage: $0 [-df] (${_allsup})"
} }
rc_write_runfile() {
_rc_write_runfile() {
[ -d ${_RC_RUNDIR} ] || mkdir -p ${_RC_RUNDIR} && \ [ -d ${_RC_RUNDIR} ] || mkdir -p ${_RC_RUNDIR} && \
print -rn -- "${pexp}" > ${_RC_RUNFILE} print -rn -- "${pexp}" > ${_RC_RUNFILE}
} }
rc_read_runfile() {
_rc_read_runfile() {
local _new_pexp local _new_pexp
[ -f ${_RC_RUNFILE} ] && _new_pexp=$(< ${_RC_RUNFILE}) [ -f ${_RC_RUNFILE} ] && _new_pexp=$(< ${_RC_RUNFILE})
[ -n "${_new_pexp}" ] && pexp="${_new_pexp}" [ -n "${_new_pexp}" ] && pexp="${_new_pexp}"
} }
rc_rm_runfile() {
_rc_rm_runfile() {
rm -f ${_RC_RUNFILE} rm -f ${_RC_RUNFILE}
} }
rc_start() {
${rcexec} "${daemon} ${daemon_flags} ${_bg}"
}
rc_check() {
pgrep -q -f "^${pexp}"
}
rc_reload() {
pkill -HUP -f "^${pexp}"
}
rc_stop() {
pkill -f "^${pexp}"
}
rc_do() {
_rc_do() {
if [ -n "${_RC_DEBUG}" ]; then if [ -n "${_RC_DEBUG}" ]; then
echo "doing $@" && "$@" echo "doing $@" && "$@"
else else
@ -77,22 +61,22 @@ rc_do() {
fi fi
} }
rc_exit() {
_rc_exit() {
local _pfix local _pfix
[ -z "${INRC}" -o X"$1" != X"ok" ] && _pfix="($1)" [ -z "${INRC}" -o X"$1" != X"ok" ] && _pfix="($1)"
echo ${INRC:+'-n'} "${_pfix}" echo ${INRC:+'-n'} "${_pfix}"
[ X"$1" = X"ok" ] && exit 0 || exit 1 [ X"$1" = X"ok" ] && exit 0 || exit 1
} }
rc_wait() {
_rc_wait() {
local _i=0 local _i=0
while [ $_i -lt ${daemon_timeout} ]; do while [ $_i -lt ${daemon_timeout} ]; do
case "$1" in case "$1" in
reload|start) reload|start)
rc_do rc_check && return 0
_rc_do rc_check && return 0
;; ;;
stop) stop)
rc_do rc_check || return 0
_rc_do rc_check || return 0
;; ;;
*) *)
break break
@ -104,95 +88,164 @@ rc_wait() {
return 1 return 1
} }
_rc_quirks() {
unset mountd_flags nfsd_flags ypbind_flags
# special care needed for spamlogd to avoid starting it up and failing
# all the time
if [ X"${spamd_flags}" = X"NO" -o X"${spamd_black}" != X"NO" ]; then
spamlogd_flags=NO
fi
# special care needed for pflogd to avoid starting it up and failing
# if pf is not enabled
if [ X"${pf}" = X"NO" ]; then
pflogd_flags=NO
fi
: ${mountd_flags=$([ X"${nfs_server-NO}" = XYES ] || echo NO)}
: ${nfsd_flags=$([ X"${nfs_server-NO}" = XYES ] && echo "-tun 4" || echo NO)}
: ${ypbind_flags=$([ X"`domainname`" != X"" -a -d /var/yp/binding ] || echo NO)}
}
_rc_parse_conf() {
typeset -l _key
local _l _val
local _rcconf="/etc/rc.conf"
local _rcconf_local="/etc/rc.conf.local"
set -A _allowed_keys -- \
spamd_black pf ipsec check_quotas accounting \
multicast_hosts multicast_router amd_master \
pf_rules ipsec_rules shlib_dirs pkg_scripts \
nfs_server
for _rcfile in $_rcconf $_rcconf_local; do
[[ -f $_rcfile ]] || return
while IFS=' ' read -r _l; do
[[ $_l == [!#=]*=* ]] || continue
_key=${_l%%*([[:blank:]])=*}
[[ $_key == *_@(flags|user|timeout) ]] || \
[[ " ${_allowed_keys[*]} " == *" $_key "* ]] || \
continue
[[ $_key == "" ]] && continue
_val=${_l##*([!=])=*([[:blank:]])}
_val=${_val%%#*}
_val=${_val%%*([[:blank:]])}
# remove leading and trailing quotes (backwards compat)
[[ $_val == @(\"*\"|\'*\') ]] && _val=${_val#?} _val=${_val%?}
[ -n "${_RC_DEBUG}" ] && printf "%18s\t>$_val<\n" $_key
eval "${_key}=\${_val}"
done < $_rcfile
done
_rc_do _rc_quirks
}
[ -n "${FUNCS_ONLY}" ] && return
rc_start() {
${rcexec} "${daemon} ${daemon_flags} ${_bg}"
}
rc_check() {
pgrep -q -f "^${pexp}"
}
rc_reload() {
pkill -HUP -f "^${pexp}"
}
rc_stop() {
pkill -f "^${pexp}"
}
rc_cmd() { rc_cmd() {
local _bg _n local _bg _n
[ "$(id -u)" -eq 0 ] || \ [ "$(id -u)" -eq 0 ] || \
[ X"${rc_usercheck}" != X"NO" -a X"$1" = "Xcheck" ] || \ [ X"${rc_usercheck}" != X"NO" -a X"$1" = "Xcheck" ] || \
rc_err "$0: need root privileges"
_rc_err "$0: need root privileges"
if ! (rc_is_supported start && rc_is_supported stop); then
if ! (_rc_is_supported start && _rc_is_supported stop); then
rc_restart=NO rc_restart=NO
fi fi
if ! rc_is_supported $1; then
if ! _rc_is_supported $1; then
[ -n "${INRC}" ] && exit 1 [ -n "${INRC}" ] && exit 1
rc_err "$0: $1 is not supported"
_rc_err "$0: $1 is not supported"
fi fi
[ X"${rc_bg}" = X"YES" ] && _bg="&" [ X"${rc_bg}" = X"YES" ] && _bg="&"
[ -n "${_RC_DEBUG}" ] || _n="-n" [ -n "${_RC_DEBUG}" ] || _n="-n"
rc_do rc_read_runfile
_rc_do _rc_read_runfile
case "$1" in case "$1" in
check) check)
rc_do rc_check
_rc_do rc_check
;; ;;
start) start)
if [ X"${daemon_flags}" = X"NO" ]; then if [ X"${daemon_flags}" = X"NO" ]; then
rc_err "$0: need -f to force $1 since ${_name}_flags=NO"
_rc_err "$0: need -f to force $1 since ${_name}_flags=NO"
exit 1 exit 1
fi fi
[ -z "${INRC}" ] && rc_do rc_check && exit 0
[ -z "${INRC}" ] && _rc_do rc_check && exit 0
echo $_n "${INRC:+ }${_name}" echo $_n "${INRC:+ }${_name}"
while true; do # no real loop, only needed to break while true; do # no real loop, only needed to break
if type rc_pre >/dev/null; then if type rc_pre >/dev/null; then
rc_do rc_pre || break
_rc_do rc_pre || break
fi fi
# XXX only checks the status of the return code, # XXX only checks the status of the return code,
# and _not_ that the daemon is actually running # and _not_ that the daemon is actually running
rc_do rc_start || break
_rc_do rc_start || break
if [ -n "${_bg}" ]; then if [ -n "${_bg}" ]; then
sleep 1 sleep 1
rc_do rc_wait start || break
_rc_do _rc_wait start || break
fi fi
rc_do rc_write_runfile
rc_exit ok
_rc_do _rc_write_runfile
_rc_exit ok
done done
# handle failure # handle failure
type rc_post >/dev/null && rc_do rc_post
rc_do rc_rm_runfile
rc_exit failed
type rc_post >/dev/null && _rc_do rc_post
_rc_do _rc_rm_runfile
_rc_exit failed
;; ;;
stop) stop)
rc_do rc_check || exit 0
_rc_do rc_check || exit 0
echo $_n "${INRC:+ }${_name}" echo $_n "${INRC:+ }${_name}"
rc_do rc_stop || rc_exit failed
rc_do rc_wait stop || rc_exit failed
_rc_do rc_stop || _rc_exit failed
_rc_do _rc_wait stop || _rc_exit failed
if type rc_post >/dev/null; then \ if type rc_post >/dev/null; then \
rc_do rc_post || rc_exit failed
_rc_do rc_post || _rc_exit failed
fi fi
rc_do rc_rm_runfile
rc_exit ok
_rc_do _rc_rm_runfile
_rc_exit ok
;; ;;
reload) reload)
rc_do rc_check || exit 0
_rc_do rc_check || exit 0
echo $_n "${INRC:+ }${_name}" echo $_n "${INRC:+ }${_name}"
rc_do rc_reload || rc_exit failed
rc_do rc_wait reload || rc_exit failed
rc_exit ok
_rc_do rc_reload || _rc_exit failed
_rc_do _rc_wait reload || _rc_exit failed
_rc_exit ok
;; ;;
restart) restart)
$0 ${_RC_DEBUG} ${_RC_FORCE} stop && $0 ${_RC_DEBUG} ${_RC_FORCE} stop &&
$0 ${_RC_DEBUG} ${_RC_FORCE} start $0 ${_RC_DEBUG} ${_RC_FORCE} start
;; ;;
*) *)
rc_usage
_rc_usage
;; ;;
esac esac
} }
. /etc/rc.conf
[ -n "${daemon}" ] || rc_err "$0: daemon is not set"
[ -n "${daemon}" ] || _rc_err "$0: daemon is not set"
unset _RC_DEBUG _RC_FORCE unset _RC_DEBUG _RC_FORCE
while getopts "df" c; do while getopts "df" c; do
case "$c" in case "$c" in
d) _RC_DEBUG=-d;; d) _RC_DEBUG=-d;;
f) _RC_FORCE=-f;; f) _RC_FORCE=-f;;
*) rc_usage;;
*) _rc_usage;;
esac esac
done done
shift $((OPTIND-1)) shift $((OPTIND-1))
@ -201,6 +254,9 @@ _name=$(basename $0)
_RC_RUNDIR=/var/run/rc.d _RC_RUNDIR=/var/run/rc.d
_RC_RUNFILE=${_RC_RUNDIR}/${_name} _RC_RUNFILE=${_RC_RUNDIR}/${_name}
# parse /etc/rc.conf{.local} for the daemon_flags
_rc_do _rc_parse_conf
eval _rcflags=\${${_name}_flags} eval _rcflags=\${${_name}_flags}
eval _rcuser=\${${_name}_user} eval _rcuser=\${${_name}_user}
eval _rctimeout=\${${_name}_timeout} eval _rctimeout=\${${_name}_timeout}


Write Preview
Loading…
Cancel
Save