summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflorian <florian@openbsd.org>2018-07-11 08:31:48 +0000
committerflorian <florian@openbsd.org>2018-07-11 08:31:48 +0000
commit77ad0a422b2af38d328d6606b283d14181b37a5f (patch)
treee3ff25f60ef4752016ed9f4cde58333e814976ea
parentExpand formats in load-buffer and save-buffer. (diff)
downloadwireguard-openbsd-77ad0a422b2af38d328d6606b283d14181b37a5f.tar.xz
wireguard-openbsd-77ad0a422b2af38d328d6606b283d14181b37a5f.zip
Don't hide errors when IPv6 forwarding is not enabled.
OK(failed) phessler OK deraadt
-rw-r--r--etc/rc11
1 files changed, 2 insertions, 9 deletions
diff --git a/etc/rc b/etc/rc
index 21f009306cb..c8556565bfd 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.525 2018/02/18 18:52:02 rpe Exp $
+# $OpenBSD: rc,v 1.526 2018/07/11 08:31:48 florian Exp $
# System startup script run by init on autoboot or after single-user.
# Output and error are redirected to console by init, and the console is the
@@ -575,14 +575,7 @@ run_upgrade_script sysmerge
echo -n 'starting network daemons:'
start_daemon ldomd sshd switchd snmpd ldpd ripd ospfd ospf6d bgpd ifstated
-start_daemon relayd dhcpd dhcrelay mrouted dvmrpd radiusd eigrpd
-
-if ifconfig lo0 inet6 >/dev/null 2>&1; then
- if (($(sysctl -n net.inet6.ip6.forwarding) == 1)); then
- start_daemon route6d rtadvd
- fi
-fi
-
+start_daemon relayd dhcpd dhcrelay mrouted dvmrpd radiusd eigrpd route6d rtadvd
start_daemon hostapd lpd smtpd slowcgi httpd ftpd
start_daemon ftpproxy ftpproxy6 tftpd tftpproxy identd inetd rarpd bootparamd
start_daemon rbootd mopd vmd spamd spamlogd sndiod