From: Paul Mackerras <paulus@samba.org>
Date: Mon, 10 Oct 1994 01:59:17 +0000 (+0000)
Subject: fix up NAK processing for old ADDRS option
X-Git-Tag: RELEASE_2_3_6~842
X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=c6fdf043048aafbedca02ba3304303799749bd50;hp=dec4aceb7c5b91e5f9ec8b62e5b6560499abc402

fix up NAK processing for old ADDRS option
---

diff --git a/pppd/ipcp.c b/pppd/ipcp.c
index 37d62c6..2735e50 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.12 1994/10/10 01:59:17 paulus Exp $";
 #endif
 
 /*
@@ -493,7 +493,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",