diff options
| author |   claudio <claudio@openbsd.org> | 2017-05-27 08:02:40 +0000 |
|---|---|---|
| committer | claudio <claudio@openbsd.org> | 2017-05-27 08:02:40 +0000 |
| commit | fd3ab9b81e1fd29d6c01a1284ff132e9bc34736d (patch) | |
| tree | fcf1d2e0e11cb0cceb9ff218502b4def86596351 | |
| parent | trim some unused compile options for alternative character forms. (diff) | |
| download | wireguard-openbsd-fd3ab9b81e1fd29d6c01a1284ff132e9bc34736d.tar.xz wireguard-openbsd-fd3ab9b81e1fd29d6c01a1284ff132e9bc34736d.zip | |
Kill option KEY, it is a useless knob, nobody uses pfkeyv2 without IPSEC or
tcp md5. OK mpi@
| -rw-r--r-- | sys/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/kern/uipc_domain.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC index 1e20abf0d5f..ba9d79bb6a1 100644 --- a/sys/conf/GENERIC +++ b/sys/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.243 2017/04/20 14:23:53 visa Exp $ +# $OpenBSD: GENERIC,v 1.244 2017/05/27 08:02:40 claudio Exp $ # # Machine-independent option; used by all architectures for their # GENERIC kernel @@ -54,7 +54,6 @@ option TCP_SIGNATURE # TCP MD5 Signatures, for BGP routing sessions option ART # Allotment Routing Table option INET6 # IPv6 option IPSEC # IPsec -#option KEY # PF_KEY (implied by IPSEC) option PPP_BSDCOMP # PPP BSD compression option PPP_DEFLATE option PIPEX # Ppp IP EXtension, for npppd diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index 1649ad5f82b..ce7091b540c 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_domain.c,v 1.50 2017/05/09 09:37:25 mpi Exp $ */ +/* $OpenBSD: uipc_domain.c,v 1.51 2017/05/27 08:02:40 claudio Exp $ */ /* $NetBSD: uipc_domain.c,v 1.14 1996/02/09 19:00:44 christos Exp $ */ /* @@ -56,7 +56,7 @@ struct domain *domains[] = { #ifdef MPLS &mplsdomain, #endif -#if defined (KEY) || defined (IPSEC) || defined (TCP_SIGNATURE) +#if defined (IPSEC) || defined (TCP_SIGNATURE) &pfkeydomain, #endif #ifdef INET6 |