Handle MS-CHAPv2 authentication correctly via the RADIUS server (if it's

configured).
Handle internal failures in radius_Authenticate() correctly.
Bump the ppp version number.

This doesn't yet work with MPPE.  More will follow.

Sponsored by: Mozoon

1 files changed, 5 insertions, 4 deletions

diff --git a/usr.sbin/ppp/pap.c b/usr.sbin/ppp/pap.c
index bc43f5d..c604831 100644
--- a/usr.sbin/ppp/pap.c
+++ b/usr.sbin/ppp/pap.c
@@ -264,10 +264,11 @@ pap_Input(struct bundle *bundle, struct link *l, struct mbuf *bp)
       key[klen] = '\0';
 
 #ifndef NORADIUS
-      if (*bundle->radius.cfg.file)
-        radius_Authenticate(&bundle->radius, authp, authp->in.name,
-                            key, strlen(key), NULL, 0);
-      else
+      if (*bundle->radius.cfg.file) {
+        if (!radius_Authenticate(&bundle->radius, authp, authp->in.name,
+                                 key, strlen(key), NULL, 0, NULL, 0))
+          pap_Failure(authp);
+      } else
 #endif
       if (auth_Validate(bundle, authp->in.name, key, p))
         pap_Success(authp);