summaryrefslogtreecommitdiff
path: root/usr.sbin/npppd
diff options
context:
space:
mode:
authorYASUOKA Masahiko <yasuoka@cvs.openbsd.org>2013-02-08 12:15:34 +0000
committerYASUOKA Masahiko <yasuoka@cvs.openbsd.org>2013-02-08 12:15:34 +0000
commit0eb7981da6be3431c0ef8f59ac2f666b55213131 (patch)
tree88cbd629a6d5cf4e38e11d3c4df828d692a4b6cc /usr.sbin/npppd
parente268a1d60bc90ec0052394ab90a8792afafa7370 (diff)
add mention about 'mppe' configuration option which is missing.
pointed out by csszep at gmail.com
Diffstat (limited to 'usr.sbin/npppd')
-rw-r--r--usr.sbin/npppd/npppd/npppd.conf.525
1 files changed, 24 insertions, 1 deletions
diff --git a/usr.sbin/npppd/npppd/npppd.conf.5 b/usr.sbin/npppd/npppd/npppd.conf.5
index 252c5f53a7c..4578e34151e 100644
--- a/usr.sbin/npppd/npppd/npppd.conf.5
+++ b/usr.sbin/npppd/npppd/npppd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: npppd.conf.5,v 1.7 2013/02/08 11:06:26 yasuoka Exp $
+.\" $OpenBSD: npppd.conf.5,v 1.8 2013/02/08 12:15:33 yasuoka Exp $
.\"
.\" Copyright (c) 2012 YASUOKA Masahiko <yasuoka@openbsd.org>
.\"
@@ -269,6 +269,29 @@ The default value is 2.
.It Ic ipcp-max-nak-loop Ar number
Specify the maximum number of IPCP configure NAK loops.
The default value is 5.
+.It Ic mppe Ar yes | no | required
+If
+.Dq yes
+is specified,
+.Xr npppd 8
+will negotiate to use Microsoft Point-to-Point Encryption (MPPE), and it
+will continue the PPP even if the negotiation fails.
+If
+.Dq required
+is specified,
+.Xr npppd 8
+will negotiate to use MPPE, and it will not continue the PPP if the
+negotiation fails.
+If
+.Dq no
+is specified,
+.Xr npppd 8
+will negotiate not to use MPPE and it will refuse to use MPPE.
+The default value is
+.Dq required
+for PPTP and
+.Dq yes
+for L2TP and PPPoE.
.It Ic mppe-key-length Ar key-length ...
Specify key lengths for this configuration.
The following key lengths can be used: