diff options
| author | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2000-01-07 21:34:59 +0000 |
|---|---|---|
| committer | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2000-01-07 21:34:59 +0000 |
| commit | 8fdbd4cd8dcc9c79cdc9040a7f13a87b0805a28d (patch) | |
| tree | 04a054198dcb6674c5c98735ff70282f77924300 | |
| parent | a668a9d13cd5ae200e2c54bc14c2e943ccaf630c (diff) | |
gre.allow and mobileip.allow
| -rw-r--r-- | sbin/sysctl/sysctl.8 | 4 | ||||
| -rw-r--r-- | sbin/sysctl/sysctl.c | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8 index 3a87c93b788..7a4868ebf54 100644 --- a/sbin/sysctl/sysctl.8 +++ b/sbin/sysctl/sysctl.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysctl.8,v 1.35 2000/01/06 02:58:01 itojun Exp $ +.\" $OpenBSD: sysctl.8,v 1.36 2000/01/07 21:34:58 angelos Exp $ .\" $NetBSD: sysctl.8,v 1.4 1995/09/30 07:12:49 thorpej Exp $ .\" .\" Copyright (c) 1993 @@ -174,6 +174,8 @@ privilege can change the value. .It net.inet.udp.baddynamic array yes .It net.inet.esp.enable integer yes .It net.inet.ah.enable integer yes +.It net.inet.gre.allow integer yes +.It net.inet.mobileip.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 33d2821843b..fa4caf24a05 100644 --- a/sbin/sysctl/sysctl.c +++ b/sbin/sysctl/sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sysctl.c,v 1.44 1999/12/30 19:06:06 provos Exp $ */ +/* $OpenBSD: sysctl.c,v 1.45 2000/01/07 21:34:58 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.44 1999/12/30 19:06:06 provos Exp $"; +static char *rcsid = "$OpenBSD: sysctl.c,v 1.45 2000/01/07 21:34:58 angelos Exp $"; #endif #endif /* not lint */ @@ -74,6 +74,7 @@ static char *rcsid = "$OpenBSD: sysctl.c,v 1.44 1999/12/30 19:06:06 provos Exp $ #include <netinet/tcp.h> #include <netinet/tcp_timer.h> #include <netinet/tcp_var.h> +#include <netinet/ip_gre.h> #ifdef INET6 #include <netinet6/ip6.h> @@ -947,6 +948,8 @@ struct ctlname udpname[] = UDPCTL_NAMES; struct ctlname espname[] = ESPCTL_NAMES; struct ctlname ahname[] = AHCTL_NAMES; struct ctlname etheripname[] = ETHERIPCTL_NAMES; +struct ctlname grename[] = GRECTL_NAMES; +struct ctlname mobileipname[] = MOBILEIPCTL_NAMES; struct list inetlist = { inetname, IPPROTO_MAXID }; struct list inetvars[] = { { ipname, IPCTL_MAXID }, /* ip */ @@ -996,7 +999,7 @@ struct list inetvars[] = { { 0, 0 }, { 0, 0 }, { 0, 0 }, - { 0, 0 }, + { grename, GRECTL_MAXID }, /* GRE */ { 0, 0 }, { 0, 0 }, { espname, ESPCTL_MAXID }, /* esp */ @@ -1004,7 +1007,7 @@ struct list inetvars[] = { { 0, 0 }, { 0, 0 }, { 0, 0 }, - { 0, 0 }, + { mobileipname, MOBILEIPCTL_MAXID }, /* mobileip */ { 0, 0 }, { 0, 0 }, { 0, 0 }, |