Added -defaultroute and -proxyarp options.

[ppp.git] / pppd / ipcp.c

diff --git a/pppd/ipcp.c b/pppd/ipcp.c
index b3096c6501e27404cf4742c87c29adbcb8143102..3d99235440b2d5a6a6a9ea97f8193679b02b9e6f 100644 (file)
--- a/pppd/ipcp.c
+++ b/pppd/ipcp.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: ipcp.c,v 1.17 1995/04/28 06:24:53 paulus Exp $";
+static char rcsid[] = "$Id: ipcp.c,v 1.20 1995/08/10 06:51:04 paulus Exp $";
 #endif
 
 /*
@@ -581,10 +581,9 @@ ipcp_nakci(f, p, len)
            if (ciaddr1 && go->accept_local)
                try.ouraddr = ciaddr1;
            if (try.ouraddr != 0)
-               no.neg_addr = 1;
+               try.neg_addr = 1;
+           no.neg_addr = 1;
            break;
-       default:
-           goto bad;
        }
        p = next;
     }
@@ -888,7 +887,7 @@ ipcp_reqci(f, inp, len, reject_if_disagree)
                    }
                }
                ho->maxslotindex = maxslotindex;
-               ho->cflag = wo->cflag;
+               ho->cflag = cflag;
            } else {
                ho->old_vj = 1;
                ho->maxslotindex = MAX_STATES - 1;