Accept MSCHAPv2 by default.

Enable and accept MPPE by default.

3 files changed, 6 insertions, 2 deletions

diff --git a/usr.sbin/ppp/README.changes b/usr.sbin/ppp/README.changes
index e4f4634..10aba34 100644
--- a/usr.sbin/ppp/README.changes
+++ b/usr.sbin/ppp/README.changes
@@ -109,3 +109,7 @@ o MP autoload throughput measurements are now based on the maximum of input
 o When only one link is open in MP mode, MP link level compression is not
   open and the peer MRU >= the peer MRRU, ppp sends outbound traffic as
   PROTO_IP traffic rather than PROTO_MP.
+o MSCHAPv2 is now accepted by default.  If you don't wish to negotiate
+  this, you must explicitly deny it.
+o MPPE is enabled and accepted by default (although deflate and predictor1
+  are preferred.
diff --git a/usr.sbin/ppp/ccp.c b/usr.sbin/ppp/ccp.c
index 01fbd69..6acfc53 100644
--- a/usr.sbin/ppp/ccp.c
+++ b/usr.sbin/ppp/ccp.c
@@ -210,7 +210,7 @@ ccp_Init(struct ccp *ccp, struct bundle *bundle, struct link *l,
   ccp->cfg.neg[CCP_NEG_DEFLATE24] = 0;
 #ifdef HAVE_DES
   ccp->cfg.mppe.keybits = 128;
-  ccp->cfg.neg[CCP_NEG_MPPE] = 0;
+  ccp->cfg.neg[CCP_NEG_MPPE] = NEG_ENABLED|NEG_ACCEPTED;
 #endif
 
   ccp_Setup(ccp);
diff --git a/usr.sbin/ppp/lcp.c b/usr.sbin/ppp/lcp.c
index b0d1e81..791780a 100644
--- a/usr.sbin/ppp/lcp.c
+++ b/usr.sbin/ppp/lcp.c
@@ -246,7 +246,7 @@ lcp_Init(struct lcp *lcp, struct bundle *bundle, struct link *l,
 #ifdef HAVE_DES
   lcp->cfg.chap80nt = NEG_ACCEPTED;
   lcp->cfg.chap80lm = NEG_ACCEPTED;
-  lcp->cfg.chap81 = 0;
+  lcp->cfg.chap81 = NEG_ACCEPTED;
 #endif
   lcp->cfg.lqr = NEG_ACCEPTED;
   lcp->cfg.pap = NEG_ACCEPTED;