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

diff --git a/pppd/upap.c b/pppd/upap.c
index b59d130..693c684 100644
--- 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.19 1999/08/13 06:46:21 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,
@@ -436,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;
 
@@ -474,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;