First large MPPE patch from Frank Cusack.

[ppp.git] / pppd / upap.c

diff --git a/pppd/upap.c b/pppd/upap.c
index 53d4a3ce09638a510cba12195246cd349bde1733..d3d9d9f41d47635066bbbddf1d0069a4f082a308 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 const char rcsid[] = "$Id: upap.c,v 1.18 1999/08/12 04:25:25 paulus Exp $";
-#endif
+#define RCSID  "$Id: upap.c,v 1.25 2002/04/02 13:54:59 dfs Exp $"
 
 /*
  * TODO:
@@ -31,20 +29,26 @@ static const char rcsid[] = "$Id: upap.c,v 1.18 1999/08/12 04:25:25 paulus Exp $
 #include "pppd.h"
 #include "upap.h"
 
-static bool hide_password;
+static const char rcsid[] = RCSID;
+
+static bool hide_password = 1;
 
 /*
  * Command-line options.
  */
 static option_t pap_option_list[] = {
     { "hide-password", o_bool, &hide_password,
-      "Don't output passwords to log", 1 },
+      "Don't output passwords to log", OPT_PRIO | 1 },
+    { "show-password", o_bool, &hide_password,
+      "Show password string in debug log messages", OPT_PRIOSUB | 0 },
+
     { "pap-restart", o_int, &upap[0].us_timeouttime,
-      "Set retransmit timeout for PAP" },
+      "Set retransmit timeout for PAP", OPT_PRIO },
     { "pap-max-authreq", o_int, &upap[0].us_maxtransmits,
-      "Set max number of transmissions for auth-reqs" },
+      "Set max number of transmissions for auth-reqs", OPT_PRIO },
     { "pap-timeout", o_int, &upap[0].us_reqtimeout,
-      "Set time limit for peer PAP authentication" },
+      "Set time limit for peer PAP authentication", OPT_PRIO },
+
     { NULL }
 };
 
@@ -372,7 +376,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,14 +399,17 @@ 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);
 
     if (retcode == UPAP_AUTHACK) {
        u->us_serverstate = UPAPSS_OPEN;
-       auth_peer_success(u->us_unit, PPP_PAP, ruser, ruserlen);
+       auth_peer_success(u->us_unit, PPP_PAP, 0, ruser, ruserlen);
     } else {
        u->us_serverstate = UPAPSS_BADAUTH;
        auth_peer_fail(u->us_unit, PPP_PAP);
@@ -432,24 +439,24 @@ 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;
 
-    auth_withpeer_success(u->us_unit, PPP_PAP);
+    auth_withpeer_success(u->us_unit, PPP_PAP, 0);
 }
 
 
@@ -472,19 +479,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;