X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fupap.c;h=6bf8dece21411fc3cc94c89a99683485b9499f45;hb=fc8a2a1cb1a141e5c1d9c9f0580e4f97271f9734;hp=5354c6cbba678d3511a1a11cc2dd92dfbe8ff3e2;hpb=1924cd095160dc3fdd6e21a3506e5e5d225a650c;p=ppp.git diff --git a/pppd/upap.c b/pppd/upap.c index 5354c6c..6bf8dec 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.17 1999/06/24 00:17:48 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.17 1999/06/24 00:17:48 paulus Exp $"; #include "pppd.h" #include "upap.h" +static const char rcsid[] = RCSID; + static bool hide_password; /* @@ -433,18 +433,18 @@ 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; + 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; @@ -473,18 +473,18 @@ 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; + 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;