diff options
| author | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2000-01-21 02:53:07 +0000 |
|---|---|---|
| committer | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2000-01-21 02:53:07 +0000 |
| commit | d188785bd15bf53ebe35f97158a3cf7f3a088638 (patch) | |
| tree | f16f8d316a89a854691f9fee30492394a3ee454a | |
| parent | 0b5ddf317949456bb030bd6609a6fb2cdf7eb330 (diff) | |
ip4.allow -> ipip.allow
| -rw-r--r-- | sbin/sysctl/sysctl.8 | 5 | ||||
| -rw-r--r-- | sbin/sysctl/sysctl.c | 10 |
2 files changed, 8 insertions, 7 deletions
diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8 index 27a32287fbc..83345ad65d0 100644 --- a/sbin/sysctl/sysctl.8 +++ b/sbin/sysctl/sysctl.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysctl.8,v 1.42 2000/01/17 00:28:26 fgsch Exp $ +.\" $OpenBSD: sysctl.8,v 1.43 2000/01/21 02:53:06 angelos Exp $ .\" $NetBSD: sysctl.8,v 1.4 1995/09/30 07:12:49 thorpej Exp $ .\" .\" Copyright (c) 1993 @@ -173,7 +173,7 @@ privilege can change the value. .It net.inet.ip.ipsec-invalid-life integer yes .It net.inet.icmp.maskrepl integer yes .It net.inet.icmp.bmcastecho integer yes -.It net.inet.ip4.allow integer yes +.It net.inet.ipip.allow integer yes .It net.inet.etherip.allow integer yes .It net.inet.tcp.rfc1323 integer yes .It net.inet.tcp.keepinittime integer yes @@ -189,6 +189,7 @@ privilege can change the value. .It net.inet.ah.enable integer yes .It net.inet.gre.allow integer yes .It net.inet.mobileip.allow integer yes +.It net.inet6.ipip.allow integer yes .It net.inet6.ip6.forwarding integer yes .It net.inet6.ip6.redirect integer yes .It net.inet6.ip6.hlim integer yes diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c index fa4caf24a05..0875d12bf8c 100644 --- a/sbin/sysctl/sysctl.c +++ b/sbin/sysctl/sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sysctl.c,v 1.45 2000/01/07 21:34:58 angelos Exp $ */ +/* $OpenBSD: sysctl.c,v 1.46 2000/01/21 02:53:06 angelos Exp $ */ /* $NetBSD: sysctl.c,v 1.9 1995/09/30 07:12:50 thorpej Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)sysctl.c 8.5 (Berkeley) 5/9/95"; #else -static char *rcsid = "$OpenBSD: sysctl.c,v 1.45 2000/01/07 21:34:58 angelos Exp $"; +static char *rcsid = "$OpenBSD: sysctl.c,v 1.46 2000/01/21 02:53:06 angelos Exp $"; #endif #endif /* not lint */ @@ -63,7 +63,7 @@ static char *rcsid = "$OpenBSD: sysctl.c,v 1.45 2000/01/07 21:34:58 angelos Exp #include <netinet/ip.h> #include <netinet/in_pcb.h> #include <netinet/ip_icmp.h> -#include <netinet/ip_ip4.h> +#include <netinet/ip_ipip.h> #include <netinet/ip_ether.h> #include <netinet/ip_ah.h> #include <netinet/ip_esp.h> @@ -942,7 +942,7 @@ sysctl_bios(string, bufpp, mib, flags, typep) struct ctlname inetname[] = CTL_IPPROTO_NAMES; struct ctlname ipname[] = IPCTL_NAMES; struct ctlname icmpname[] = ICMPCTL_NAMES; -struct ctlname ip4name[] = IP4CTL_NAMES; +struct ctlname ipipname[] = IPIPCTL_NAMES; struct ctlname tcpname[] = TCPCTL_NAMES; struct ctlname udpname[] = UDPCTL_NAMES; struct ctlname espname[] = ESPCTL_NAMES; @@ -956,7 +956,7 @@ struct list inetvars[] = { { icmpname, ICMPCTL_MAXID }, /* icmp */ { 0, 0 }, /* igmp */ { 0, 0 }, /* ggmp */ - { ip4name, IP4CTL_MAXID }, /* ipencap */ + { ipipname, IPIPCTL_MAXID }, /* ipencap */ { 0, 0 }, { tcpname, TCPCTL_MAXID }, /* tcp */ { 0, 0 }, |