X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fupap.c;h=5354c6cbba678d3511a1a11cc2dd92dfbe8ff3e2;hb=a8ac4606ea90b5951d701b303e0ddcb87934c9e1;hp=0078adfeec17d981f51a16bb3f5cdfada9e292da;hpb=1e7bc3ea35208555bf233daacee9d85ded13f999;p=ppp.git

diff --git a/pppd/upap.c b/pppd/upap.c
index 0078adf..5354c6c 100644
--- a/pppd/upap.c
+++ b/pppd/upap.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: upap.c,v 1.15 1999/03/16 22:54:43 paulus Exp $";
+static char rcsid[] = "$Id: upap.c,v 1.17 1999/06/24 00:17:48 paulus Exp $";
 #endif
 
 /*
@@ -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,
@@ -437,13 +437,15 @@ upap_rauthack(u, inp, id, len)
 	return;
     }
     GETCHAR(msglen, inp);
-    len -= sizeof (u_char);
-    if (len < msglen) {
-	UPAPDEBUG(("pap_rauthack: rcvd short packet."));
-	return;
+    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;
 
@@ -475,13 +477,15 @@ upap_rauthnak(u, inp, id, len)
 	return;
     }
     GETCHAR(msglen, inp);
-    len -= sizeof (u_char);
-    if (len < msglen) {
-	UPAPDEBUG(("pap_rauthnak: rcvd short packet."));
-	return;
+    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;