From 789b166a5fa8884c40b9b805cc585ddeb33480bf Mon Sep 17 00:00:00 2001
From: ajacoutot <>
Date: Thu, 21 Mar 2019 15:10:27 +0000
Subject: [PATCH] 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@
---
 src/etc/rc.d/rc.subr | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/etc/rc.d/rc.subr b/src/etc/rc.d/rc.subr
index 8b414160..6a8e05e3 100644
--- a/src/etc/rc.d/rc.subr
+++ b/src/etc/rc.d/rc.subr
@@ -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}"