diff options
| author | brian <brian@FreeBSD.org> | 1999-04-11 08:51:04 +0000 |
|---|---|---|
| committer | brian <brian@FreeBSD.org> | 1999-04-11 08:51:04 +0000 |
| commit | e52674f2ac1c918ec787302fd5b4eeb7c27e668f (patch) | |
| tree | 92da05c9280e54dae85797cf0840d4969d4536fc /usr.sbin/ppp/async.c | |
| parent | 16aba24e8f714f2de5cb5850c1b380feb5b8d44d (diff) | |
| download | FreeBSD-src-e52674f2ac1c918ec787302fd5b4eeb7c27e668f.zip FreeBSD-src-e52674f2ac1c918ec787302fd5b4eeb7c27e668f.tar.gz | |
Revert the ACCMAP changes where we OR the peers accmap
with our own if there are differing bits (last two revisions
of lcp.c). This change broke at least one negotiation
session.
Instead, we just use an OR of the two accmap values when
we're doing the ASYNC framing.
Diffstat (limited to 'usr.sbin/ppp/async.c')
| -rw-r--r-- | usr.sbin/ppp/async.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/ppp/async.c b/usr.sbin/ppp/async.c index ef59427..ff24153 100644 --- a/usr.sbin/ppp/async.c +++ b/usr.sbin/ppp/async.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: async.c,v 1.16 1998/05/21 21:43:55 brian Exp $ + * $Id: async.c,v 1.17 1998/06/16 19:40:34 brian Exp $ * */ #include <sys/types.h> @@ -57,7 +57,7 @@ void async_SetLinkParams(struct async *async, struct lcp *lcp) { async->my_accmap = lcp->want_accmap; - async->his_accmap = lcp->his_accmap; + async->his_accmap = lcp->his_accmap | lcp->want_accmap; } /* |
