[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. debian/4.1.1-P1-16.1-35-gdde373e

[Andrew Pollock]

The following commit has been merged in the master branch:
commit dde373e9545fcc729dab71a9728d7095aad25268
Author: Andrew Pollock <apollock at debian.org>
Date:   Sat Aug 27 14:03:51 2011 -0700

    support IPv6 link-local resolvers
    
    Following RFC 4007, append the interface name, separated with a % sign
    to the name server's adress if it is a link-local one.
    
    Patch from Peter Marschall

diff --git a/debian/changelog b/debian/changelog
index 9fa2c78..8ac492c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,8 +33,10 @@ isc-dhcp (4.2.2-1) unstable; urgency=low
     dhcp-client to isc-dhcp-client (closes: #236001)
   * debian/dhclient-script.{linux,kfreebsd}: apply patch from Peter Marschall
     to fix metric calculation (closes: #629632)
+  * debian/dhclient-script.linux: apply patches from Peter Marschall to support
+    IPv6 link-local resolvers
 
- -- Andrew Pollock <apollock at debian.org>  Sat, 27 Aug 2011 13:56:44 -0700
+ -- Andrew Pollock <apollock at debian.org>  Sat, 27 Aug 2011 14:02:57 -0700
 
 isc-dhcp (4.1.1-P1-18) unstable; urgency=low
 
diff --git a/debian/dhclient-script.linux b/debian/dhclient-script.linux
index 2c054e7..ae99cc0 100644
--- a/debian/dhclient-script.linux
+++ b/debian/dhclient-script.linux
@@ -66,6 +66,11 @@ make_resolv_conf() {
 
         if [ -n "$new_dhcp6_name_servers" ]; then
             for nameserver in $new_dhcp6_name_servers; do
+                # append %interface to link-local-address nameservers
+                if [ "${nameserver##fe80::}" != "$nameserver" ] ||
+                   [ "${nameserver##FE80::}" != "$nameserver" ]; then
+                    nameserver="${nameserver}%${interface}"
+                fi
                 echo nameserver $nameserver >>$new_resolv_conf
             done
         else # keep 'old' nameservers

-- 
ISC DHCP packaging for Debian