summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortmarkwalder <tmark@isc.org>2017-06-30 14:26:40 -0400
committertmarkwalder <tmark@isc.org>2017-06-30 14:26:40 -0400
commit1ce96b68bfd358c224972e42ec025abb94568855 (patch)
treec8e43551b1d69f5d6f3730aceb2939a7dfa67ae6
parentb0021d1ef6269ea81d052f8557d61d8030debe35 (diff)
downloadisc-dhcp-1ce96b68bfd358c224972e42ec025abb94568855.tar.gz
[v4_1_esv] Use alias/-alias for ifconfig calls in netbsd & openbsd client scripts
Merges rt31573.
-rw-r--r--RELNOTES5
-rwxr-xr-xclient/scripts/netbsd4
-rw-r--r--client/scripts/openbsd4
3 files changed, 9 insertions, 4 deletions
diff --git a/RELNOTES b/RELNOTES
index 9cdfaceb..061b056e 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 6a41edf4..07383b78 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 151b50aa..e7f4746f 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