fix for junky peers from James Carlson

[ppp.git] / pppd / upap.c

diff --git a/pppd/upap.c b/pppd/upap.c
index b59d13031ad9e6c7f0d5f224bfae23f6c586afb2..6bf8dece21411fc3cc94c89a99683485b9499f45 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.14 1999/03/16 03:15:15 paulus Exp $";
-#endif
+#define RCSID  "$Id: upap.c,v 1.20 1999/08/24 05:29:26 paulus Exp $"
 
 /*
  * TODO:
@@ -31,6 +29,8 @@ static char rcsid[] = "$Id: upap.c,v 1.14 1999/03/16 03:15:15 paulus Exp $";
 #include "pppd.h"
 #include "upap.h"
 
+static const char rcsid[] = RCSID;
+
 static bool hide_password;
 
 /*
@@ -38,7 +38,7 @@ static bool hide_password;
  */
 static option_t pap_option_list[] = {
     { "hide-password", o_bool, &hide_password,
-      "Don't output passwords to log" },
+      "Don't output passwords to log", 1 },
     { "pap-restart", o_int, &upap[0].us_timeouttime,
       "Set retransmit timeout for PAP" },
     { "pap-max-authreq", o_int, &upap[0].us_maxtransmits,
@@ -72,6 +72,7 @@ struct protent pap_protent = {
     NULL,
     1,
     "PAP",
+    NULL,
     pap_option_list,
     NULL,
     NULL,
@@ -432,17 +433,19 @@ upap_rauthack(u, inp, id, len)
      * Parse message.
      */
     if (len < sizeof (u_char)) {
-       UPAPDEBUG(("pap_rauthack: rcvd short packet."));
-       return;
-    }
-    GETCHAR(msglen, inp);
-    len -= sizeof (u_char);
-    if (len < msglen) {
-       UPAPDEBUG(("pap_rauthack: rcvd short packet."));
-       return;
+       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;
 
@@ -470,17 +473,19 @@ upap_rauthnak(u, inp, id, len)
      * Parse message.
      */
     if (len < sizeof (u_char)) {
-       UPAPDEBUG(("pap_rauthnak: rcvd short packet."));
-       return;
-    }
-    GETCHAR(msglen, inp);
-    len -= sizeof (u_char);
-    if (len < msglen) {
-       UPAPDEBUG(("pap_rauthnak: rcvd short packet."));
-       return;
+       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;