[pkg-dhcp-commits] [isc-dhcp] 01/01: don't assume ipv6 prefix length of 64

[Michael Gilbert]

This is an automated email from the git hooks/post-receive script.

mgilbert pushed a commit to branch master
in repository isc-dhcp.

commit c347ab8a43587164486ce1f104eedfd638594e59
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sun Oct 4 03:26:49 2015 +0000

    don't assume ipv6 prefix length of 64
---
 debian/changelog             |  7 +++++++
 debian/dhclient-script.linux | 14 +++++---------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6073357..7325ae9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+isc-dhcp (4.3.3-6) UNRELEASED; urgency=medium
+
+  * Don't assume IPv6 prefix length of 64 (closes: #684009).
+    - Thanks to Arne Nordmark.
+
+ -- Michael Gilbert <mgilbert at debian.org>  Sun, 04 Oct 2015 03:24:47 +0000
+
 isc-dhcp (4.3.3-5) unstable; urgency=medium
 
   * Add dependencies for the debug package.
diff --git a/debian/dhclient-script.linux b/debian/dhclient-script.linux
index d576935..1e71f96 100644
--- a/debian/dhclient-script.linux
+++ b/debian/dhclient-script.linux
@@ -355,9 +355,9 @@ case "$reason" in
         ;;
 
     BOUND6|RENEW6|REBIND6)
-        if [ "${new_ip6_address}" ] && [ "${new_ip6_prefixlen}" ]; then
+        if [ "${new_ip6_address}" ]; then
             # set leased IP
-            ip -6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
+            ip -6 addr add ${new_ip6_address} \
                 dev ${interface} scope global
         fi
 
@@ -371,23 +371,19 @@ case "$reason" in
         ;;
 
     DEPREF6)
-        if [ -z "${cur_ip6_prefixlen}" ]; then
-            exit_with_hooks 2
-        fi
-
         # set preferred lifetime of leased IP to 0
-        ip -6 addr change ${cur_ip6_address}/${cur_ip6_prefixlen} \
+        ip -6 addr change ${cur_ip6_address} \
             dev ${interface} scope global preferred_lft 0
 
         ;;
 
     EXPIRE6|RELEASE6|STOP6)
-        if [ -z "${old_ip6_address}" ] || [ -z "${old_ip6_prefixlen}" ]; then
+        if [ -z "${old_ip6_address}" ]; then
             exit_with_hooks 2
         fi
 
         # delete leased IP
-        ip -6 addr del ${old_ip6_address}/${old_ip6_prefixlen} \
+        ip -6 addr del ${old_ip6_address} \
             dev ${interface}
 
         ;;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-dhcp/isc-dhcp.git