diff options
| -rw-r--r-- | distrib/miniroot/dot.profile | 6 | ||||
| -rw-r--r-- | sys/netinet6/nd6_rtr.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/distrib/miniroot/dot.profile b/distrib/miniroot/dot.profile index 82dc113194f..367c49fc615 100644 --- a/distrib/miniroot/dot.profile +++ b/distrib/miniroot/dot.profile @@ -1,4 +1,4 @@ -# $OpenBSD: dot.profile,v 1.37 2017/02/20 21:27:36 rpe Exp $ +# $OpenBSD: dot.profile,v 1.38 2017/07/08 15:45:11 florian Exp $ # $NetBSD: dot.profile,v 1.1 1995/12/18 22:54:43 pk Exp $ # # Copyright (c) 2009 Kenneth R. Westerback @@ -54,6 +54,10 @@ if [[ -z $DONEPROFILE ]]; then # Create a fake rc that just returns 1 and throws us back. echo ! : >/etc/rc + if [[ -x /sbin/slaacd ]]; then + /sbin/slaacd + fi + # Set up some sane defaults. echo 'erase ^?, werase ^W, kill ^U, intr ^C, status ^T' stty newcrt werase ^W intr ^C kill ^U erase ^? status ^T diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index ff087ae81b8..4879c9643dd 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6_rtr.c,v 1.161 2017/06/09 12:56:44 mpi Exp $ */ +/* $OpenBSD: nd6_rtr.c,v 1.162 2017/07/08 15:45:11 florian Exp $ */ /* $KAME: nd6_rtr.c,v 1.97 2001/02/07 11:09:13 itojun Exp $ */ /* @@ -282,9 +282,7 @@ nd6_rs_output(struct ifnet* ifp, struct in6_ifaddr *ia6) void nd6_rs_output_set_timo(int timeout) { -#ifndef SMALL_KERNEL return; -#endif /* SMALL_KERNEL */ nd6_rs_output_timeout = timeout; timeout_add_sec(&nd6_rs_output_timer, nd6_rs_output_timeout); } @@ -384,9 +382,7 @@ nd6_ra_input(struct mbuf *m, int off, int icmp6len) if (ifp == NULL) goto freeit; -#ifndef SMALL_KERNEL goto freeit; -#endif /* SMALL_KERNEL */ /* We accept RAs only if inet6 autoconf is enabled */ if (!(ifp->if_xflags & IFXF_AUTOCONF6)) |