merge 17500

5 files changed, 35 insertions, 9 deletions

diff --git a/client/scripts/bsdos b/client/scripts/bsdos
index 12077f0c..7f858502 100755
--- a/client/scripts/bsdos
+++ b/client/scripts/bsdos
@@ -242,6 +242,12 @@ if [ ${reason} = PREINIT6 ] ; then
   exit_with_hooks 0
 fi
 
+if [ x${old_ip6_prefix} != x ] || [ x${new_ip6_prefix} != x ] ; then
+    echo Prefix ${reason} old=${old_ip6_prefix} new=${new_ip6_prefix}
+
+    exit_with_hooks 0
+fi
+
 if [ ${reason} = BOUND6 ] ; then
   if [ x${new_ip6_address} = x ] || [ x${new_ip6_prefixlen} = x ] ; then
     exit_with_hooks 2;
diff --git a/client/scripts/freebsd b/client/scripts/freebsd
index 67ff002e..ea8f5bb5 100755
--- a/client/scripts/freebsd
+++ b/client/scripts/freebsd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: freebsd,v 1.21 2008/01/16 23:02:10 dhankins Exp $
+# $Id: freebsd,v 1.22 2008/05/23 13:56:07 fdupont Exp $
 #
 # $FreeBSD$
 
@@ -306,6 +306,12 @@ if [ ${reason} = PREINIT6 ] ; then
   exit_with_hooks 0
 fi
 
+if [ x${old_ip6_prefix} != x ] || [ x${new_ip6_prefix} != x ] ; then
+    echo Prefix ${reason} old=${old_ip6_prefix} new=${new_ip6_prefix}
+
+    exit_with_hooks 0
+fi
+
 if [ ${reason} = BOUND6 ] ; then
   if [ x${new_ip6_address} = x ] || [ x${new_ip6_prefixlen} = x ] ; then
     exit_with_hooks 2;
@@ -332,13 +338,11 @@ if [ ${reason} = RENEW6 ] || [ ${reason} = REBIND6 ] ; then
 fi
 
 if [ ${reason} = DEPREF6 ] ; then
-  if [ x${new_ip6_prefixlen} = x ] ; then
+  if [ x${new_ip6_address} = x ] ; then
     exit_with_hooks 2;
   fi
 
-  # XXX:
-  # There doesn't appear to be a way to update an addr to indicate
-  # preference.
+  ifconfig ${interface} inet6 ${new_ip6_address} deprecated
 
   exit_with_hooks 0
 fi
diff --git a/client/scripts/linux b/client/scripts/linux
index a0fcab55..49f0977d 100755
--- a/client/scripts/linux
+++ b/client/scripts/linux
@@ -243,6 +243,12 @@ if [ ${reason} = PREINIT6 ] ; then
   exit_with_hooks 0
 fi
 
+if [ x${old_ip6_prefix} != x ] || [ x${new_ip6_prefix} != x ] ; then
+    echo Prefix ${reason} old=${old_ip6_prefix} new=${new_ip6_prefix}
+
+    exit_with_hooks 0
+fi
+
 if [ ${reason} = BOUND6 ] ; then
   if [ x${new_ip6_address} = x ] || [ x${new_ip6_prefixlen} = x ] ; then
     exit_with_hooks 2;
@@ -274,10 +280,8 @@ if [ ${reason} = DEPREF6 ] ; then
     exit_with_hooks 2;
   fi
 
-  # There doesn't appear to be a way to update an addr to indicate
-  # preference.
-#  ${ip} -f inet6 addr ??? ${new_ip6_address}/${new_ip6_prefixlen} \
-#       dev ${interface} scope global deprecated?
+  ${ip} -f inet6 addr change ${new_ip6_address}/${new_ip6_prefixlen} \
+       dev ${interface} scope global preferred_lft 0
 
   exit_with_hooks 0
 fi
diff --git a/client/scripts/netbsd b/client/scripts/netbsd
index a5394796..7a26d28d 100755
--- a/client/scripts/netbsd
+++ b/client/scripts/netbsd
@@ -242,6 +242,12 @@ if [ ${reason} = PREINIT6 ] ; then
   exit_with_hooks 0
 fi
 
+if [ x${old_ip6_prefix} != x ] || [ x${new_ip6_prefix} != x ] ; then
+    echo Prefix ${reason} old=${old_ip6_prefix} new=${new_ip6_prefix}
+
+    exit_with_hooks 0
+fi
+
 if [ ${reason} = BOUND6 ] ; then
   if [ x${new_ip6_address} = x ] || [ x${new_ip6_prefixlen} = x ] ; then
     exit_with_hooks 2;
diff --git a/client/scripts/openbsd b/client/scripts/openbsd
index 1b8d7b02..182c7d6c 100644
--- a/client/scripts/openbsd
+++ b/client/scripts/openbsd
@@ -242,6 +242,12 @@ if [ ${reason} = PREINIT6 ] ; then
   exit_with_hooks 0
 fi
 
+if [ x${old_ip6_prefix} != x ] || [ x${new_ip6_prefix} != x ] ; then
+    echo Prefix ${reason} old=${old_ip6_prefix} new=${new_ip6_prefix}
+
+    exit_with_hooks 0
+fi
+
 if [ ${reason} = BOUND6 ] ; then
   if [ x${new_ip6_address} = x ] || [ x${new_ip6_prefixlen} = x ] ; then
     exit_with_hooks 2;