[dhcp/f20] - dhclient-script: IPv6 address which fails DAD is auto-removed (#1133465)

[Jiří Popelka]

commit 1b7877057d43c9e1a7c2f30a54e4d078ddba0396
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Mon Aug 25 18:57:47 2014 +0200

    - dhclient-script: IPv6 address which fails DAD is auto-removed (#1133465)

 dhclient-script |   11 +++++++++--
 dhcp.spec       |    2 ++
 2 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/dhclient-script b/dhclient-script
index 5b1c4e8..a07dca2 100644
--- a/dhclient-script
+++ b/dhclient-script
@@ -565,8 +565,15 @@ add_ipv6_addr_with_DAD() {
                     exit_with_hooks 3
                 fi
                 if [ -z "${tentative}" ] ; then
-                    # DAD is over
-                    return 0
+                    addr=$(ip -6 addr show dev ${interface} \
+                          | grep ${new_ip6_address}/${new_ip6_prefixlen})
+                    if [ -n "${addr}" ]; then
+                        # DAD is over
+                        return 0
+                    else
+                        # address was auto-removed (or not added at all)
+                        exit_with_hooks 3
+                    fi
                 fi
             done
 }
diff --git a/dhcp.spec b/dhcp.spec
index e0ed1bf..2320edd 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -600,6 +600,8 @@ done
 %changelog
 * Mon Aug 25 2014 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.7-3
 - spec: use -D with 'install'
+- dhclient-script: IPv6 address which fails DAD is auto-removed when it was
+  added with valid_lft/preferred_lft other then 'forever' (#1133465)
 
 * Thu Aug 14 2014 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.7-2
 - dhclient-script: PREINIT6: make sure link-local address is available (#1129500)