diff options
| author | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2011-07-08 18:45:48 +0000 |
|---|---|---|
| committer | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2011-07-08 18:45:48 +0000 |
| commit | e725e962d96968a49b9f487e48c089999cd07acd (patch) | |
| tree | 972892a20da07709337a01fe3bea5bf3d5b8aa0f /sys | |
| parent | b8421f9c0d529449591ff36c0cffcd1477bd35b5 (diff) | |
this also must be included my previous commit. sorry.
Include PIPEX in kernel by default. And add new sysctl variable
`net.pipex.enable' to enable PIPEX. By default, pipex is disabled
and it will not process packets from wire. Update man pages and
update HOWTO_PIPEX_NPPPD.txt for testers.
discussed with dlg@, ok deraadt@ mcbride@ claudio@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/conf/GENERIC | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC index 584995ed105..ef154904ae7 100644 --- a/sys/conf/GENERIC +++ b/sys/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.178 2011/07/08 15:09:32 jsg Exp $ +# $OpenBSD: GENERIC,v 1.179 2011/07/08 18:45:47 yasuoka Exp $ # # Machine-independent option; used by all architectures for their # GENERIC kernel @@ -61,7 +61,7 @@ option IPSEC # IPsec #option NETATALK # AppleTalk option PPP_BSDCOMP # PPP BSD compression option PPP_DEFLATE -#option PIPEX # Pppac IP EXtension, for npppd +option PIPEX # Pppac IP EXtension, for npppd option MROUTING # Multicast router #option PIM # Protocol Independent Multicast option MPLS # Multi-Protocol Label Switching @@ -100,7 +100,7 @@ pseudo-device loop # network loopback pseudo-device mpe # MPLS PE interface pseudo-device ppp # PPP pseudo-device pppoe # PPP over Ethernet (RFC 2516) -#pseudo-device pppx # PPP multiplexer +pseudo-device pppx # PPP multiplexer pseudo-device sl # CSLIP pseudo-device sppp 1 # Sync PPP/HDLC pseudo-device trunk # Trunking support |