[v4_1_esv] Use alias/-alias for ifconfig calls in netbsd & openbsd client scripts

    Merges rt31573.

diff --git a/RELNOTES b/RELNOTES
index 9cdfacebfaeb12fafca6e3d9ceb4c0f283a82675..061b056e5c2b506d2c07851684a0425f343cb444 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -186,6 +186,11 @@ by Eric Young (eay@cryptsoft.com).
   number of false positives when UDP checksum offloading is enabled.
   [ISC-bugs #41757]
 
+- Replaced ifconfig parameters "add" and "delete" with "alias" and "-alias"
+  for IPv6 mode in the client scripts, netbsd and openbsd.  This was
+  preventing IPv6 addresses from being added or removed from interfaces.
+  [ISC-bugs #31573]
+
                        Changes since 4.1-ESV-R14b1
 - None
 

diff --git a/client/scripts/netbsd b/client/scripts/netbsd
index 6a41edf421bcd4bbf03a8ff8094a090f061fe02f..07383b784745e7a54ac251c602a1af97982a92c0 100755 (executable)
--- a/client/scripts/netbsd
+++ b/client/scripts/netbsd
@@ -314,7 +314,7 @@ if [ ${reason} = BOUND6 ] ; then
     exit_with_hooks 2;
   fi
 
-  ifconfig ${interface} inet6 add ${new_ip6_address}/${new_ip6_prefixlen}
+  ifconfig ${interface} inet6 alias ${new_ip6_address}/${new_ip6_prefixlen}
 
   # Check for nameserver options.
   make_resolv_conf
@@ -351,7 +351,7 @@ if [ ${reason} = EXPIRE6 -o ${reason} = RELEASE6 -o ${reason} = STOP6 ] ; then
     exit_with_hooks 2;
   fi
 
-  ifconfig ${interface} inet6 delete ${old_ip6_address}/${old_ip6_prefixlen}
+  ifconfig ${interface} inet6 -alias ${old_ip6_address}/${old_ip6_prefixlen}
 
   exit_with_hooks 0
 fi

diff --git a/client/scripts/openbsd b/client/scripts/openbsd
index 151b50aa7f82d4e4aab08480cd9eff28cc40e069..e7f4746f316f79a5446c29fd4a0428955564c1e6 100644 (file)
--- a/client/scripts/openbsd
+++ b/client/scripts/openbsd
@@ -308,7 +308,7 @@ if [ ${reason} = BOUND6 ] ; then
     exit_with_hooks 2;
   fi
 
-  ifconfig ${interface} inet6 add ${new_ip6_address}/${new_ip6_prefixlen}
+  ifconfig ${interface} inet6 alias ${new_ip6_address}/${new_ip6_prefixlen}
 
   # Check for nameserver options.
   make_resolv_conf
@@ -345,7 +345,7 @@ if [ ${reason} = EXPIRE6 -o ${reason} = RELEASE6 -o ${reason} = STOP6 ] ; then
     exit_with_hooks 2;
   fi
 
-  ifconfig ${interface} inet6 delete ${old_ip6_address}/${old_ip6_prefixlen}
+  ifconfig ${interface} inet6 -alias ${old_ip6_address}/${old_ip6_prefixlen}
 
   exit_with_hooks 0
 fi