Undo botched commit (local changes got in)

This commit is contained in:
Brian Somers 1997-09-23 19:52:14 +00:00
parent a12f9b749f
commit 3f1125194b
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=29744

View file

@ -17,7 +17,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* $Id: lcp.c,v 1.32 1997/09/22 02:51:24 brian Exp $
* $Id: lcp.c,v 1.33 1997/09/22 23:59:14 brian Exp $
*
* TODO:
* o Validate magic number received from peer.
@ -291,7 +291,7 @@ LcpSendConfigReq(struct fsm * fp)
break;
case PROTO_CHAP:
PutConfValue(&cp, cftypes, TY_AUTHPROTO, 5, lcp->want_auth);
*cp++ = VarEncMD4 ? 0x80 : 0x05; /* Use MD4/MD5 */
*cp++ = 5; /* Use MD4/MD5 */
break;
}
FsmOutput(fp, CODE_CONFIGREQ, fp->reqid++, ReqBuff, cp - ReqBuff);
@ -510,11 +510,10 @@ LcpDecodeConfig(u_char * cp, int plen, int mode)
LogPrintf(LogLCP, " %s bad length (%d)\n", request, length);
goto reqreject;
}
if (Acceptable(ConfChap) && (cp[4] == 5 || cp[4] == 0x80)) {
if (Acceptable(ConfChap) && cp[4] == 5) {
LcpInfo.his_auth = proto;
bcopy(cp, ackp, length);
ackp += length;
VarEncMD4 = cp[4] == 0x80;
} else if (Acceptable(ConfPap)) {
*nakp++ = *cp;
*nakp++ = 4;