diff options
author | brian <brian@FreeBSD.org> | 1999-01-12 21:50:20 +0000 |
---|---|---|
committer | brian <brian@FreeBSD.org> | 1999-01-12 21:50:20 +0000 |
commit | db2579cb8b4ed0609373eecdd370cdb2dbd78fbf (patch) | |
tree | 9ceab534533e8c7be702eeefba819094492bdd50 /usr.sbin/ppp/lcp.c | |
parent | 3ffba58dfcb00c94ea1c3ee7813b96ddff88cec3 (diff) | |
download | FreeBSD-src-db2579cb8b4ed0609373eecdd370cdb2dbd78fbf.zip FreeBSD-src-db2579cb8b4ed0609373eecdd370cdb2dbd78fbf.tar.gz |
If we've configured CBCP *and* another not-so-important
CALLBACK protocol and end up agreeing CBCP, DTRT and go
into CBCP phase rather than mistakenly terminating as
if CBCP wasn't agreed.
Problem reported by: Alexander Dubinin <alex@nstl.nnov.ru>
Diffstat (limited to 'usr.sbin/ppp/lcp.c')
-rw-r--r-- | usr.sbin/ppp/lcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/ppp/lcp.c b/usr.sbin/ppp/lcp.c index 462b81f..10165fd 100644 --- a/usr.sbin/ppp/lcp.c +++ b/usr.sbin/ppp/lcp.c @@ -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.64 1998/09/09 00:03:09 brian Exp $ + * $Id: lcp.c,v 1.65 1998/10/17 12:28:02 brian Exp $ * * TODO: * o Limit data field length by MRU @@ -921,7 +921,7 @@ LcpDecodeConfig(struct fsm *fp, u_char *cp, int plen, int mode_type, goto reqreject; break; case MODE_NAK: - /* We don't do what he NAKs want, we do things in our preferred order */ + /* We don't do what he NAKs with, we do things in our preferred order */ if (lcp->want_callback.opmask & CALLBACK_BIT(CALLBACK_AUTH)) lcp->want_callback.opmask &= ~CALLBACK_BIT(CALLBACK_AUTH); else if (lcp->want_callback.opmask & CALLBACK_BIT(CALLBACK_CBCP)) |