diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2014-07-11 16:43:08 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2014-07-11 16:43:08 +0000 |
| commit | a4eb8d9ea129f7f0ffda70510e27b0ab713d019c (patch) | |
| tree | 8e07112b43b74f19ae0c0618782c47feb56cfff0 | |
| parent | 9265f14857ccf89d8a8f024ee6f36965c62d62e2 (diff) | |
net.inet6.ip6.accept_rtadv bit the bucket
ok florian bluhm benno stsp
| -rw-r--r-- | etc/sysctl.conf | 3 | ||||
| -rw-r--r-- | sbin/sysctl/sysctl.8 | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/etc/sysctl.conf b/etc/sysctl.conf index 5e14ae56bd7..c297506d424 100644 --- a/etc/sysctl.conf +++ b/etc/sysctl.conf @@ -1,4 +1,4 @@ -# $OpenBSD: sysctl.conf,v 1.57 2014/05/22 14:11:41 tedu Exp $ +# $OpenBSD: sysctl.conf,v 1.58 2014/07/11 16:43:07 henning Exp $ # # This file contains a list of sysctl options the user wants set at # boot time. See sysctl(3) and sysctl(8) for more information on @@ -12,7 +12,6 @@ #net.inet6.ip6.forwarding=1 # 1=Permit forwarding (routing) of IPv6 packets #net.inet6.ip6.mforwarding=1 # 1=Permit forwarding (routing) of IPv6 multicast packets #net.inet6.ip6.multipath=1 # 1=Enable IPv6 multipath routing -#net.inet6.ip6.accept_rtadv=1 # 1=Permit IPv6 autoconf (forwarding must be 0) #net.inet.tcp.always_keepalive=1 # 1=Keepalives for all connections (e.g. hotel/airport NAT) #net.inet.tcp.keepidle=100 # 100=send TCP keepalives every 50 seconds #net.inet.esp.enable=0 # 0=Disable the ESP IPsec protocol diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8 index 51f0e61336d..a0214d0e7dc 100644 --- a/sbin/sysctl/sysctl.8 +++ b/sbin/sysctl/sysctl.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysctl.8,v 1.181 2014/07/11 12:20:26 benno Exp $ +.\" $OpenBSD: sysctl.8,v 1.182 2014/07/11 16:43:07 henning Exp $ .\" $NetBSD: sysctl.8,v 1.4 1995/09/30 07:12:49 thorpej Exp $ .\" .\" Copyright (c) 1993 @@ -292,7 +292,6 @@ and a few require a kernel compiled with non-standard .It net.inet6.ip6.redirect Ta integer Ta yes .It net.inet6.ip6.hlim Ta integer Ta yes .It net.inet6.ip6.maxfragpackets Ta integer Ta yes -.It net.inet6.ip6.accept_rtadv Ta integer Ta yes .It net.inet6.ip6.log_interval Ta integer Ta yes .It net.inet6.ip6.hdrnestlimit Ta integer Ta yes .It net.inet6.ip6.dad_count Ta integer Ta yes |