X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fipcp.c;h=2566fc82e0ddc1663bbc300a15c94bae16969399;hb=a44a616baa968a263dc273bc06ed79c475b7deec;hp=b3096c6501e27404cf4742c87c29adbcb8143102;hpb=bee9bbb1e96af1697d4045e03928f86159538337;p=ppp.git

diff --git a/pppd/ipcp.c b/pppd/ipcp.c
index b3096c6..2566fc8 100644
--- 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.21 1995/08/17 11:57:12 paulus Exp $";
 #endif
 
 /*
@@ -149,6 +149,13 @@ ipcp_init(unit)
     ao->neg_vj = 1;
     ao->maxslotindex = MAX_STATES - 1;
     ao->cflag = 1;
+
+    /*
+     * XXX These control whether the user may use the proxyarp
+     * and defaultroute options.
+     */
+    ao->proxy_arp = 1;
+    ao->default_route = 1;
 }
 
 
@@ -581,10 +588,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 +894,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;