fix stats stuff

[ppp.git] / pppd / ccp.c

diff --git a/pppd/ccp.c b/pppd/ccp.c
index 90a7ff190156c72bbf68d536b0c94944c00096f9..0ecfc97e281233099182818c316621580f697732 100644 (file)
--- a/pppd/ccp.c
+++ b/pppd/ccp.c
@@ -26,7 +26,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: ccp.c,v 1.7 1995/04/24 06:01:18 paulus Exp $";
+static char rcsid[] = "$Id: ccp.c,v 1.9 1995/05/19 03:17:09 paulus Exp $";
 #endif
 
 #include <syslog.h>
@@ -112,7 +112,7 @@ ccp_init(unit)
     ccp_wantoptions[0].bsd_bits = 12;  /* default value */
 
     ccp_allowoptions[0].bsd_compress = 1;
-    ccp_allowoptions[0].bsd_bits = MAX_BSD_BITS;
+    ccp_allowoptions[0].bsd_bits = BSD_MAX_BITS;
 }
 
 /*
@@ -432,10 +432,10 @@ ccp_reqci(f, p, lenp, dont_nak)
                    || nb > ao->bsd_bits) {
                    newret = CONFNAK;
                    nb = ao->bsd_bits;
-               } else if (nb < MIN_BSD_BITS) {
+               } else if (nb < BSD_MIN_BITS) {
                    newret = CONFREJ;
                } else if (!ccp_test(f->unit, p, CILEN_BSD_COMPRESS, 1)) {
-                   if (nb > MIN_BSD_BITS) {
+                   if (nb > BSD_MIN_BITS) {
                        --nb;
                        newret = CONFNAK;
                    } else
@@ -452,6 +452,8 @@ ccp_reqci(f, p, lenp, dont_nak)
            }
        }
 
+       if (newret == CONFNAK && dont_nak)
+           newret = CONFREJ;
        if (!(newret == CONFACK || newret == CONFNAK && ret == CONFREJ)) {
            /* we're returning this option */
            if (newret == CONFREJ && ret == CONFNAK)