Browse Source

Start in the daemon configured routing table and not in the one we're currently

in. This fixes the case where one would be in a non default rdomain shell then
run an rdomain 0 rc.d daemon.
reported by YASUOKA Masahiko and Pierre Emeriaud
ok sthen@ claudio@ benno@
OPENBSD_6_5
ajacoutot 5 years ago
parent
commit
789b166a5f
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      src/etc/rc.d/rc.subr

+ 2
- 2
src/etc/rc.d/rc.subr View File

@ -1,4 +1,4 @@
# $OpenBSD: rc.subr,v 1.130 2019/01/20 04:52:07 ajacoutot Exp $
# $OpenBSD: rc.subr,v 1.131 2019/03/21 15:10:27 ajacoutot Exp $
#
# Copyright (c) 2010, 2011, 2014-2017 Antoine Jacoutot <ajacoutot@openbsd.org>
# Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@ -320,5 +320,5 @@ unset _rcflags _rcrtable _rcuser _rctimeout
# make sure pexp matches the process (i.e. doesn't include the quotes)
pexp="$(eval echo ${daemon}${daemon_flags:+ ${daemon_flags}})"
rcexec="su -l -c ${daemon_class} -s /bin/sh ${daemon_user} -c"
[ "${daemon_rtable}" -eq 0 ] ||
[ "${daemon_rtable}" -eq "$(id -R)" ] ||
rcexec="route -T ${daemon_rtable} exec ${rcexec}"

Loading…
Cancel
Save