X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fupap.c;h=7e5f0d56ecc37193c4efe3c3ed53c99aeeba55d3;hb=26703b215b0b68d7005e6b5e41d744101471a743;hp=693c684f084105ccfc764482129a05c00d188956;hpb=a3630de20e34796f434a728bfd9cf1a961380c82;p=ppp.git

diff --git a/pppd/upap.c b/pppd/upap.c
index 693c684..7e5f0d5 100644
--- a/pppd/upap.c
+++ b/pppd/upap.c
@@ -17,7 +17,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define RCSID	"$Id: upap.c,v 1.19 1999/08/13 06:46:21 paulus Exp $"
+#define RCSID	"$Id: upap.c,v 1.23 1999/11/20 05:11:47 paulus Exp $"
 
 /*
  * TODO:
@@ -31,7 +31,7 @@
 
 static const char rcsid[] = RCSID;
 
-static bool hide_password;
+static bool hide_password = 1;
 
 /*
  * Command-line options.
@@ -39,6 +39,8 @@ static bool hide_password;
 static option_t pap_option_list[] = {
     { "hide-password", o_bool, &hide_password,
       "Don't output passwords to log", 1 },
+    { "show-password", o_bool, &hide_password,
+      "Show password string in debug log messages", 0 },
     { "pap-restart", o_int, &upap[0].us_timeouttime,
       "Set retransmit timeout for PAP" },
     { "pap-max-authreq", o_int, &upap[0].us_maxtransmits,
@@ -372,7 +374,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 +397,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 +437,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 +477,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;