diff options
| author | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 1999-02-24 22:59:44 +0000 |
|---|---|---|
| committer | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 1999-02-24 22:59:44 +0000 |
| commit | 36bd2c11fa82bf660b2afb557336df2c64aa1349 (patch) | |
| tree | 796485bc978d47018ac836386123177fb42c76fa /usr.sbin | |
| parent | 90d9399a7062b349c729756db2e00935e5b6872b (diff) | |
New position for the encdebug variable.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/sysctl/sysctl.8 | 4 | ||||
| -rw-r--r-- | usr.sbin/sysctl/sysctl.c | 13 |
2 files changed, 8 insertions, 9 deletions
diff --git a/usr.sbin/sysctl/sysctl.8 b/usr.sbin/sysctl/sysctl.8 index cbe6db62e09..49ace609332 100644 --- a/usr.sbin/sysctl/sysctl.8 +++ b/usr.sbin/sysctl/sysctl.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysctl.8,v 1.20 1999/02/23 04:20:27 marc Exp $ +.\" $OpenBSD: sysctl.8,v 1.21 1999/02/24 22:59:43 angelos Exp $ .\" $NetBSD: sysctl.8,v 1.4 1995/09/30 07:12:49 thorpej Exp $ .\" .\" Copyright (c) 1993 @@ -164,7 +164,7 @@ privilege can change the value. .It net.inet.udp.baddynamic array yes .It net.ipx.ipx.recvspace integer yes .It net.ipx.ipx.sendspace integer yes -.It net.ipsec.encap.encdebug integer yes +.It net.ipsec.pfkey.encdebug integer yes .It debug.syncprt integer yes .It debug.busyprt integer yes .It debug.doclusterread integer yes diff --git a/usr.sbin/sysctl/sysctl.c b/usr.sbin/sysctl/sysctl.c index 5e90bd52e91..5b63afe40e8 100644 --- a/usr.sbin/sysctl/sysctl.c +++ b/usr.sbin/sysctl/sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sysctl.c,v 1.35 1998/03/19 07:36:11 deraadt Exp $ */ +/* $OpenBSD: sysctl.c,v 1.36 1999/02/24 22:59:43 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.35 1998/03/19 07:36:11 deraadt Exp $"; +static char *rcsid = "$OpenBSD: sysctl.c,v 1.36 1999/02/24 22:59:43 angelos Exp $"; #endif #endif /* not lint */ @@ -56,7 +56,6 @@ static char *rcsid = "$OpenBSD: sysctl.c,v 1.35 1998/03/19 07:36:11 deraadt Exp #include <sys/socket.h> #include <vm/vm_param.h> #include <machine/cpu.h> - #include <net/route.h> #include <netinet/in.h> @@ -77,7 +76,7 @@ static char *rcsid = "$OpenBSD: sysctl.c,v 1.35 1998/03/19 07:36:11 deraadt Exp #include <netipx/spx_var.h> #include <ddb/db_var.h> #include <dev/rndvar.h> -#include <net/encap.h> +#include <net/pfkeyv2.h> #include <netinet/ip_ipsp.h> #include <err.h> @@ -392,7 +391,7 @@ parse(string, flags) break; return; } - if (mib[1] == PF_ENCAP) { + if (mib[1] == PF_KEY_V2) { len = sysctl_ipsec(string, &bufp, mib, flags, &type); if (len >= 0) break; @@ -886,11 +885,11 @@ sysctl_bios(string, bufpp, mib, flags, typep) } #endif -struct ctlname encapname[] = ENCAPCTL_NAMES; +struct ctlname encapname[] = PFKEYCTL_NAMES; struct ctlname ipsecname[] = CTL_IPSEC_NAMES; struct list ipseclist = { ipsecname, IPSECCTL_MAXID }; struct list ipsecvars[] = { - { encapname, ENCAPCTL_MAXID }, + { encapname, IPSECCTL_MAXID }, }; /* |