diff -Nru isc-dhcp-4.2.4/debian/changelog isc-dhcp-4.2.4/debian/changelog --- isc-dhcp-4.2.4/debian/changelog 2017-05-25 08:20:49.000000000 -0400 +++ isc-dhcp-4.2.4/debian/changelog 2017-10-12 08:48:06.000000000 -0400 @@ -1,3 +1,10 @@ +isc-dhcp (4.2.4-7ubuntu12.11) trusty; urgency=medium + + * dhclient-script.linux: handle empty case also when waiting for ipv6 link local DAD. + (LP: #1718568) + + -- Dan Streetman Thu, 12 Oct 2017 08:48:06 -0400 + isc-dhcp (4.2.4-7ubuntu12.10) trusty; urgency=medium * Introduction of a new binary package "isc-dhcp-client-noddns" (LP: #1176046) diff -Nru isc-dhcp-4.2.4/debian/dhclient-script.linux isc-dhcp-4.2.4/debian/dhclient-script.linux --- isc-dhcp-4.2.4/debian/dhclient-script.linux 2016-10-31 14:31:58.000000000 -0400 +++ isc-dhcp-4.2.4/debian/dhclient-script.linux 2017-10-12 08:48:06.000000000 -0400 @@ -167,12 +167,18 @@ error "$dev: checking for link-local addresses failed"; return 1 } + # another note: the output may be empty if the link local tentative addr + # isn't up just yet, so we need to make sure there is at least one 'inet6' + # match before returning success. We need to keep checking for both + # 'tentative' case and default (no inet6 address) case. (LP: #1718568) + # Don't reorder tentative/inet6 - we need to check for tentative first. case " $out " in *\ dadfailed\ *) error "$dev: ipv6 dad failed." return 1;; *\ tentative\ *) :;; - *) return 0;; + *\ inet6\ *) return 0;; + *) :;; esac [ $n -lt $attempts ] || { error "$dev: time out waiting for permanent link-local address"