From: tmarkwalder <tmark@isc.org>
Date: Fri, 30 Jun 2017 18:26:40 +0000 (-0400)
Subject: [v4_1_esv] Use alias/-alias for ifconfig calls in netbsd & openbsd client scripts
X-Git-Tag: v4_1_esv_r15b1~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ce96b68bfd358c224972e42ec025abb94568855;p=thirdparty%2Fdhcp.git

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

    Merges rt31573.
---

diff --git a/RELNOTES b/RELNOTES
index 9cdfacebf..061b056e5 100644
--- 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 6a41edf42..07383b784 100755
--- 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 151b50aa7..e7f4746f3 100644
--- 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