diff options
| author | Brian Somers <brian@FreeBSD.org> | 2002-03-30 12:30:09 +0000 |
|---|---|---|
| committer | Brian Somers <brian@FreeBSD.org> | 2002-03-30 12:30:09 +0000 |
| commit | fb11a9c23d3da57e67bc474faa1ba0e55899d7b8 (patch) | |
| tree | b285f7b912098d74c02bd2a8b542e1472a52003a /usr.sbin/ppp/ccp.c | |
| parent | 997f6e03b8cf94a308d742264c1204d393588fa0 (diff) | |
| download | src-fb11a9c23d3da57e67bc474faa1ba0e55899d7b8.tar.gz src-fb11a9c23d3da57e67bc474faa1ba0e55899d7b8.zip | |
Merge the NETGRAPH branch into HEAD. tty devices now use netgraph's line
discipline to do the async escaping, but no other benefits are available yet.
Change ``ifdef HAVE_DES'' to ``ifndef NODES'' for consistency.
Make the Makefile a little more sane WRT RELEASE_CRUNCH.
Notes
Notes:
svn path=/head/; revision=93418
Diffstat (limited to 'usr.sbin/ppp/ccp.c')
| -rw-r--r-- | usr.sbin/ppp/ccp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/ppp/ccp.c b/usr.sbin/ppp/ccp.c index c7cea94a8261..8465c5dee784 100644 --- a/usr.sbin/ppp/ccp.c +++ b/usr.sbin/ppp/ccp.c @@ -70,7 +70,7 @@ #ifndef NORADIUS #include "radius.h" #endif -#ifdef HAVE_DES +#ifndef NODES #include "mppe.h" #endif #include "ipv6cp.h" @@ -148,7 +148,7 @@ static const struct ccp_algorithm * const algorithm[] = { &DeflateAlgorithm, &Pred1Algorithm, &PppdDeflateAlgorithm -#ifdef HAVE_DES +#ifndef NODES , &MPPEAlgorithm #endif }; @@ -197,7 +197,7 @@ ccp_ReportStatus(struct cmdargs const *arg) prompt_Printf(arg->prompt, " deflate windows: "); prompt_Printf(arg->prompt, "incoming = %d, ", ccp->cfg.deflate.in.winsize); prompt_Printf(arg->prompt, "outgoing = %d\n", ccp->cfg.deflate.out.winsize); -#ifdef HAVE_DES +#ifndef NODES prompt_Printf(arg->prompt, " MPPE: "); if (ccp->cfg.mppe.keybits) prompt_Printf(arg->prompt, "%d bits, ", ccp->cfg.mppe.keybits); @@ -224,7 +224,7 @@ ccp_ReportStatus(struct cmdargs const *arg) command_ShowNegval(ccp->cfg.neg[CCP_NEG_PRED1])); prompt_Printf(arg->prompt, " DEFLATE24: %s\n", command_ShowNegval(ccp->cfg.neg[CCP_NEG_DEFLATE24])); -#ifdef HAVE_DES +#ifndef NODES prompt_Printf(arg->prompt, " MPPE: %s\n", command_ShowNegval(ccp->cfg.neg[CCP_NEG_MPPE])); #endif @@ -257,7 +257,7 @@ ccp_Init(struct ccp *ccp, struct bundle *bundle, struct link *l, ccp->cfg.neg[CCP_NEG_DEFLATE] = NEG_ENABLED|NEG_ACCEPTED; ccp->cfg.neg[CCP_NEG_PRED1] = NEG_ENABLED|NEG_ACCEPTED; ccp->cfg.neg[CCP_NEG_DEFLATE24] = 0; -#ifdef HAVE_DES +#ifndef NODES ccp->cfg.mppe.keybits = 0; ccp->cfg.mppe.state = MPPE_ANYSTATE; ccp->cfg.mppe.required = 0; |