From: Paul Mackerras <paulus@samba.org>
Date: Thu, 22 Mar 2001 00:42:33 +0000 (+0000)
Subject: prevent ipv6 stuff from complaining about no addresses in demand mode
X-Git-Tag: ppp-2.4.7~484
X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=0232ca8230065290dd165ffaecf8a96ec177c28d;hp=b18e8ba1f8883d9558a7dcbef89e632a02a4071e

prevent ipv6 stuff from complaining about no addresses in demand mode
if ipv6 is not enabled
---

diff --git a/pppd/ipv6cp.c b/pppd/ipv6cp.c
index cf7fed8..3a370a0 100644
--- a/pppd/ipv6cp.c
+++ b/pppd/ipv6cp.c
@@ -90,10 +90,10 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: ipv6cp.c,v 1.14 2001/03/08 05:29:28 paulus Exp $ 
+ * $Id: ipv6cp.c,v 1.15 2001/03/22 00:42:33 paulus Exp $ 
  */
 
-#define RCSID	"$Id: ipv6cp.c,v 1.14 2001/03/08 05:29:28 paulus Exp $"
+#define RCSID	"$Id: ipv6cp.c,v 1.15 2001/03/22 00:42:33 paulus Exp $"
 
 /*
  * TODO: 
@@ -1024,6 +1024,9 @@ ipv6_check_options()
 {
     ipv6cp_options *wo = &ipv6cp_wantoptions[0];
 
+    if (!ipv6cp_protent.enabled_flag)
+	return;
+
 #if defined(SOL2)
     /*
      * Persistent link-local id is only used when user has not explicitly