X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fipcp.c;h=f20257931721952fb8b7a967c7d3d739f12c35eb;hp=37d62c694ab69f9021c112d4289cf873e7efcdc4;hb=6a34bc9a3edf435bc67e81755b65acb6786c98b3;hpb=a3396b002507d72b3e1f1169bd02ae018539654b diff --git a/pppd/ipcp.c b/pppd/ipcp.c index 37d62c6..f202579 100644 --- a/pppd/ipcp.c +++ b/pppd/ipcp.c @@ -18,7 +18,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: ipcp.c,v 1.11 1994/09/21 06:47:37 paulus Exp $"; +static char rcsid[] = "$Id: ipcp.c,v 1.13 1994/10/22 11:54:04 paulus Exp $"; #endif /* @@ -30,6 +30,7 @@ static char rcsid[] = "$Id: ipcp.c,v 1.11 1994/09/21 06:47:37 paulus Exp $"; #include #include #include +#include #include "pppd.h" #include "fsm.h" @@ -493,7 +494,7 @@ ipcp_nakci(f, p, len) * Accept the peer's idea of {our,his} address, if different * from our idea, only if the accept_{local,remote} flag is set. */ - NAKCIADDR(CI_ADDR, neg_addr, go->old_addrs, + NAKCIADDR((go->old_addrs? CI_ADDRS: CI_ADDR), neg_addr, go->old_addrs, if (go->accept_local && ciaddr1) { /* Do we know our address? */ try.ouraddr = ciaddr1; IPCPDEBUG((LOG_INFO, "local IP address %s",