Enable PPP filtering by default on Linux.

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index 85113d070c92a36e6540df0deeb9dcfc77597ca5..b52a1292e179298c98ea8f8725b237bce0842abe 100644 (file)
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -1,6 +1,6 @@
 #
 # pppd makefile for Linux
 #
 # pppd makefile for Linux

-# $Id: Makefile.linux,v 1.59 2003/06/11 23:56:26 paulus Exp $
+# $Id: Makefile.linux,v 1.60 2003/11/27 21:55:19 paulus Exp $

 #
 
 # Default installation locations
 #
 
 # Default installation locations


@@ -46,9 +46,8 @@ MPPE=y
 
 # Uncomment the next line to include support for PPP packet filtering.
 # This requires that the libpcap library and headers be installed
 
 # Uncomment the next line to include support for PPP packet filtering.
 # This requires that the libpcap library and headers be installed

-# and that the kernel driver support PPP packet filtering, which it
-# doesn't yet.
-#FILTER=y
+# and that the kernel driver support PPP packet filtering.
+FILTER=y

 
 # Uncomment the next line to enable multilink PPP (enabled by default)
 # Linux distributions: Please leave multilink ENABLED in your builds
 
 # Uncomment the next line to enable multilink PPP (enabled by default)
 # Linux distributions: Please leave multilink ENABLED in your builds

diff --git a/pppd/pppd.8 b/pppd/pppd.8
index ecf01daf15657b6a090a3d9612ce93d15d9c98e6..500949f9cdd1ad39a66169f469fd894272a4ef5d 100644 (file)
--- a/pppd/pppd.8
+++ b/pppd/pppd.8
@@ -1,5 +1,5 @@
 .\" manual page [] for pppd 2.4
 .\" manual page [] for pppd 2.4

-.\" $Id: pppd.8,v 1.73 2003/06/29 10:04:50 paulus Exp $
+.\" $Id: pppd.8,v 1.74 2003/11/27 21:55:19 paulus Exp $

 .\" SH section heading
 .\" SS subsection heading
 .\" LP paragraph
 .\" SH section heading
 .\" SS subsection heading
 .\" LP paragraph


@@ -215,8 +215,8 @@ except that qualifiers which are inappropriate for a PPP link, such as
 \fBether\fR and \fBarp\fR, are not permitted.  Generally the filter
 expression should be enclosed in single-quotes to prevent whitespace
 in the expression from being interpreted by the shell. This option
 \fBether\fR and \fBarp\fR, are not permitted.  Generally the filter
 expression should be enclosed in single-quotes to prevent whitespace
 in the expression from being interpreted by the shell. This option

-is currently only available under NetBSD or Linux, and then only
-if both the kernel and pppd were compiled with PPP_FILTER defined.
+is currently only available under Linux, and requires that the kernel
+was configured to include PPP filtering support (CONFIG_PPP_FILTER).

 .TP
 .B allow-ip \fIaddress(es)
 Allow peers to use the given IP address or subnet without
 .TP
 .B allow-ip \fIaddress(es)
 Allow peers to use the given IP address or subnet without


@@ -831,7 +831,7 @@ Specifies a packet filter to applied to data packets being sent or
 received to determine which packets should be allowed to pass.
 Packets which are rejected by the filter are silently discarded.  This
 option can be used to prevent specific network daemons (such as
 received to determine which packets should be allowed to pass.
 Packets which are rejected by the filter are silently discarded.  This
 option can be used to prevent specific network daemons (such as

-routed) using up link bandwidth, or to provide a basic firewall
+routed) using up link bandwidth, or to provide a very basic firewall

 capability.
 The \fIfilter-expression\fR syntax is as described for tcpdump(1),
 except that qualifiers which are inappropriate for a PPP link, such as
 capability.
 The \fIfilter-expression\fR syntax is as described for tcpdump(1),
 except that qualifiers which are inappropriate for a PPP link, such as


@@ -840,8 +840,8 @@ expression should be enclosed in single-quotes to prevent whitespace
 in the expression from being interpreted by the shell.  Note that it
 is possible to apply different constraints to incoming and outgoing
 packets using the \fBinbound\fR and \fBoutbound\fR qualifiers. This
 in the expression from being interpreted by the shell.  Note that it
 is possible to apply different constraints to incoming and outgoing
 packets using the \fBinbound\fR and \fBoutbound\fR qualifiers. This

-option is currently only available under NetBSD or Linux, and then
-only if both the kernel and pppd were compiled with PPP_FILTER defined.
+option is currently only available under Linux, and requires that the
+kernel was configured to include PPP filtering support (CONFIG_PPP_FILTER).

 .TP
 .B password \fIpassword-string
 Specifies the password to use for authenticating to the peer.  Use
 .TP
 .B password \fIpassword-string
 Specifies the password to use for authenticating to the peer.  Use