summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/conf/NOTES3
-rw-r--r--sys/conf/files10
-rw-r--r--sys/conf/options3
-rw-r--r--sys/i386/conf/LINT3
-rw-r--r--sys/i386/conf/NOTES3
5 files changed, 21 insertions, 1 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index cb0e103..27cd19e 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -394,6 +394,9 @@ options NETGRAPH_HOLE
options NETGRAPH_IFACE
options NETGRAPH_KSOCKET
options NETGRAPH_LMI
+# MPPC compression requires proprietary files (not included)
+#options NETGRAPH_MPPC_COMPRESSION
+options NETGRAPH_MPPC_ENCRYPTION
options NETGRAPH_PPP
options NETGRAPH_PPPOE
options NETGRAPH_PPTPGRE
diff --git a/sys/conf/files b/sys/conf/files
index af9baff..a0e1514 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -519,7 +519,6 @@ msdosfs/msdosfs_vfsops.c optional msdosfs
msdosfs/msdosfs_vnops.c optional msdosfs
net/bpf.c standard
net/bpf_filter.c optional bpf
-net/bpf_filter.c optional netgraph_bpf
net/bridge.c optional bridge
net/bsd_comp.c optional ppp_bsdcomp
#net/hostcache.c standard
@@ -643,6 +642,7 @@ netgraph/ng_UI.c optional netgraph_UI
netgraph/ng_async.c optional netgraph_async
netgraph/ng_base.c optional netgraph
netgraph/ng_bpf.c optional netgraph_bpf
+net/bpf_filter.c optional netgraph_bpf
netgraph/ng_cisco.c optional netgraph_cisco
netgraph/ng_echo.c optional netgraph_echo
netgraph/ng_frame_relay.c optional netgraph_frame_relay
@@ -650,6 +650,14 @@ netgraph/ng_hole.c optional netgraph_hole
netgraph/ng_iface.c optional netgraph_iface
netgraph/ng_ksocket.c optional netgraph_ksocket
netgraph/ng_lmi.c optional netgraph_lmi
+netgraph/ng_mppc.c optional netgraph_mppc_compression
+# The next two files (plus the header file net/mppc.h) are proprietary and
+# must be obtained elsewhere in order to enable NETGRAPH_MPPC_COMPRESSION
+net/mppcc.c optional netgraph_mppc_compression
+net/mppcd.c optional netgraph_mppc_compression
+netgraph/ng_mppc.c optional netgraph_mppc_encryption
+crypto/rc4/rc4.c optional netgraph_mppc_encryption
+crypto/sha1.c optional netgraph_mppc_encryption
netgraph/ng_parse.c optional netgraph
netgraph/ng_ppp.c optional netgraph_ppp
netgraph/ng_pppoe.c optional netgraph_pppoe
diff --git a/sys/conf/options b/sys/conf/options
index d7c0090..c200a94 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -283,6 +283,9 @@ NETGRAPH_HOLE opt_netgraph.h
NETGRAPH_IFACE opt_netgraph.h
NETGRAPH_KSOCKET opt_netgraph.h
NETGRAPH_LMI opt_netgraph.h
+# MPPC compression requires proprietary files (not included)
+NETGRAPH_MPPC_COMPRESSION opt_netgraph.h
+NETGRAPH_MPPC_ENCRYPTION opt_netgraph.h
NETGRAPH_PPP opt_netgraph.h
NETGRAPH_PPPOE opt_netgraph.h
NETGRAPH_PPTPGRE opt_netgraph.h
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index cb0e103..27cd19e 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -394,6 +394,9 @@ options NETGRAPH_HOLE
options NETGRAPH_IFACE
options NETGRAPH_KSOCKET
options NETGRAPH_LMI
+# MPPC compression requires proprietary files (not included)
+#options NETGRAPH_MPPC_COMPRESSION
+options NETGRAPH_MPPC_ENCRYPTION
options NETGRAPH_PPP
options NETGRAPH_PPPOE
options NETGRAPH_PPTPGRE
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index cb0e103..27cd19e 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -394,6 +394,9 @@ options NETGRAPH_HOLE
options NETGRAPH_IFACE
options NETGRAPH_KSOCKET
options NETGRAPH_LMI
+# MPPC compression requires proprietary files (not included)
+#options NETGRAPH_MPPC_COMPRESSION
+options NETGRAPH_MPPC_ENCRYPTION
options NETGRAPH_PPP
options NETGRAPH_PPPOE
options NETGRAPH_PPTPGRE
OpenPOWER on IntegriCloud