mention modules.conf as well as conf.modules

[ppp.git] / pppd / upap.c

diff --git a/pppd/upap.c b/pppd/upap.c
index 5354c6cbba678d3511a1a11cc2dd92dfbe8ff3e2..4e5c045a71ce344a465d0804586e24164c4469ae 100644 (file)
--- a/pppd/upap.c
+++ b/pppd/upap.c
@@ -17,9 +17,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static char rcsid[] = "$Id: upap.c,v 1.17 1999/06/24 00:17:48 paulus Exp $";
-#endif
+#define RCSID  "$Id: upap.c,v 1.22 1999/11/15 01:51:53 paulus Exp $"
 
 /*
  * TODO:
@@ -31,6 +29,8 @@ static char rcsid[] = "$Id: upap.c,v 1.17 1999/06/24 00:17:48 paulus Exp $";
 #include "pppd.h"
 #include "upap.h"
 
+static const char rcsid[] = RCSID;
+
 static bool hide_password;
 
 /*
@@ -372,7 +372,7 @@ upap_rauthreq(u, inp, id, len)
     /*
      * Parse user/passwd.
      */
-    if (len < sizeof (u_char)) {
+    if (len < 1) {
        UPAPDEBUG(("pap_rauth: rcvd short packet."));
        return;
     }
@@ -395,8 +395,11 @@ upap_rauthreq(u, inp, id, len)
      * Check the username and password given.
      */
     retcode = check_passwd(u->us_unit, ruser, ruserlen, rpasswd,
-                          rpasswdlen, &msg, &msglen);
+                          rpasswdlen, &msg);
     BZERO(rpasswd, rpasswdlen);
+    msglen = strlen(msg);
+    if (msglen > 255)
+       msglen = 255;
 
     upap_sresp(u, retcode, id, msg, msglen);
 
@@ -432,19 +435,19 @@ upap_rauthack(u, inp, id, len)
     /*
      * Parse message.
      */
-    if (len < sizeof (u_char)) {
-       UPAPDEBUG(("pap_rauthack: rcvd short packet."));
-       return;
-    }
-    GETCHAR(msglen, inp);
-    if (msglen > 0) {
-       len -= sizeof (u_char);
-       if (len < msglen) {
-           UPAPDEBUG(("pap_rauthack: rcvd short packet."));
-           return;
+    if (len < 1) {
+       UPAPDEBUG(("pap_rauthack: ignoring missing msg-length."));
+    } else {
+       GETCHAR(msglen, inp);
+       if (msglen > 0) {
+           len -= sizeof (u_char);
+           if (len < msglen) {
+               UPAPDEBUG(("pap_rauthack: rcvd short packet."));
+               return;
+           }
+           msg = (char *) inp;
+           PRINTMSG(msg, msglen);
        }
-       msg = (char *) inp;
-       PRINTMSG(msg, msglen);
     }
 
     u->us_clientstate = UPAPCS_OPEN;
@@ -472,19 +475,19 @@ upap_rauthnak(u, inp, id, len)
     /*
      * Parse message.
      */
-    if (len < sizeof (u_char)) {
-       UPAPDEBUG(("pap_rauthnak: rcvd short packet."));
-       return;
-    }
-    GETCHAR(msglen, inp);
-    if (msglen > 0) {
-       len -= sizeof (u_char);
-       if (len < msglen) {
-           UPAPDEBUG(("pap_rauthnak: rcvd short packet."));
-           return;
+    if (len < 1) {
+       UPAPDEBUG(("pap_rauthnak: ignoring missing msg-length."));
+    } else {
+       GETCHAR(msglen, inp);
+       if (msglen > 0) {
+           len -= sizeof (u_char);
+           if (len < msglen) {
+               UPAPDEBUG(("pap_rauthnak: rcvd short packet."));
+               return;
+           }
+           msg = (char *) inp;
+           PRINTMSG(msg, msglen);
        }
-       msg = (char *) inp;
-       PRINTMSG(msg, msglen);
     }
 
     u->us_clientstate = UPAPCS_BADAUTH;