Multilink support.

[ppp.git] / pppd / ipv6cp.c

diff --git a/pppd/ipv6cp.c b/pppd/ipv6cp.c
index f444348f8dcbd1dfbfb7fa5b6d8776528dbd7fd4..98cae543fe29eb9d88658bb6c2ff12b9eee3c3e7 100644 (file)
--- a/pppd/ipv6cp.c
+++ b/pppd/ipv6cp.c
@@ -95,10 +95,10 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: ipv6cp.c,v 1.6 1999/09/30 19:57:45 masputra Exp $ 
+ * $Id: ipv6cp.c,v 1.8 2000/04/04 07:06:50 paulus Exp $ 
  */
 
-#define RCSID  "$Id: ipv6cp.c,v 1.6 1999/09/30 19:57:45 masputra Exp $"
+#define RCSID  "$Id: ipv6cp.c,v 1.8 2000/04/04 07:06:50 paulus Exp $"
 
 /*
  * TODO: 
@@ -1120,8 +1120,8 @@ ipv6cp_up(f)
            return;
        }
     }
-    script_setenv("LLLOCAL", llv6_ntoa(go->ourid));
-    script_setenv("LLREMOTE", llv6_ntoa(ho->hisid));
+    script_setenv("LLLOCAL", llv6_ntoa(go->ourid), 0);
+    script_setenv("LLREMOTE", llv6_ntoa(ho->hisid), 0);
 
 #ifdef IPV6CP_COMP
     /* set tcp compression */
@@ -1203,12 +1203,6 @@ ipv6cp_up(f)
     np_up(f->unit, PPP_IPV6);
     ipv6cp_is_up = 1;
 
-    /*
-     * In Solaris, neighbor discovery and router advertisement are done
-     * automatically by in.ndpd daemon when the interface comes up or down
-     * and /etc/inet/ndpd.conf is configured properly
-     */
-#if !defined(SOL2)
     /*
      * Execute the ipv6-up script, like this:
      * /etc/ppp/ipv6-up interface tty speed local-LL remote-LL
@@ -1217,7 +1211,6 @@ ipv6cp_up(f)
        ipv6cp_script_state = s_up;
        ipv6cp_script(_PATH_IPV6UP);
     }
-#endif /* !defined(SOL2) */
 }
 
 
@@ -1264,18 +1257,11 @@ ipv6cp_down(f)
 #endif
     }
 
-    /*
-     * In Solaris, neighbor discovery and router advertisement are done
-     * automatically by in.ndpd daemon when the interface comes up or down
-     * and /etc/inet/ndpd.conf is configured properly
-     */
-#if !defined(SOL2)
     /* Execute the ipv6-down script */
     if (ipv6cp_script_state == s_up && ipv6cp_script_pid == 0) {
        ipv6cp_script_state = s_down;
        ipv6cp_script(_PATH_IPV6DOWN);
     }
-#endif /* !defined(SOL2) */
 }