__linux__ (already defined by compiler) not _linux_ (manually defined)

[ppp.git] / pppd / ipv6cp.c

diff --git a/pppd/ipv6cp.c b/pppd/ipv6cp.c
index b877625c74f55f7bc4b5384222e9d11d3411553d..0026f54562e77e3c8b622f8147090fe550385c61 100644 (file)
--- 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.13 2001/03/08 05:11:12 paulus Exp $ 
+ * $Id: ipv6cp.c,v 1.16 2002/09/14 08:10:11 etbe Exp $ 
  */
 
-#define RCSID  "$Id: ipv6cp.c,v 1.13 2001/03/08 05:11:12 paulus Exp $"
+#define RCSID  "$Id: ipv6cp.c,v 1.16 2002/09/14 08:10:11 etbe Exp $"
 
 /*
  * TODO: 
@@ -193,7 +193,7 @@ static option_t ipv6cp_option_list[] = {
     { "ipv6cp-use-ipaddr", o_bool, &ipv6cp_allowoptions[0].use_ip,
       "Use (default) IPv4 address as interface identifier", 1 },
 
-#if defined(SOL2)
+#if defined(SOL2) || defined(__linux__)
     { "ipv6cp-use-persistent", o_bool, &ipv6cp_wantoptions[0].use_persistent,
       "Use uniquely-available persistent value for link local address", 1 },
 #endif /* defined(SOL2) */
@@ -330,8 +330,10 @@ setifaceid(argv)
     return 1;
 }
 
+char *llv6_ntoa(eui64_t ifaceid);
+
 static void
-printipaddr(opt, printer, arg)
+printifaceid(opt, printer, arg)
     option_t *opt;
     void (*printer) __P((void *, char *, ...));
     void *arg;
@@ -1024,7 +1026,10 @@ ipv6_check_options()
 {
     ipv6cp_options *wo = &ipv6cp_wantoptions[0];
 
-#if defined(SOL2)
+    if (!ipv6cp_protent.enabled_flag)
+       return;
+
+#if defined(SOL2) || defined(__linux__)
     /*
      * Persistent link-local id is only used when user has not explicitly
      * configure/hard-code the id