[v4_1_esv] Merged in fix for 36102

36102 - Client scripts were not updatig resolv.conf when reason is
RENEW6 or REBIND6 and mode is stateless.  Note this only affects
the linux and openwrt scripts as only these two flush the interface
of "stale" addresses in PREINIT6
Added release note.

diff --git a/RELNOTES b/RELNOTES
index 8225a0c27604d914ba59b2de51c7dbaf8ddbdeeb..5c31bcecd7693cd3405d57412765ab9e30ddda6b 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -57,7 +57,12 @@ ISC DHCP is open source software maintained by Internet Systems
 Consortium.  This product includes cryptographic software written
 by Eric Young (eay@cryptsoft.com).
 
-                       Changes since 4.1-ESV-R9
+                       Changes since 4.1-ESV-R10b1
+
+- Modify the linux and openwrt dhclient scripts to process information
+  from a stateless request.  Thanks to Jiri Popelka at Red Hat for the
+  bug report and patch.
+  [ISC-Bugs 36102]
 
 - Tidy up several small tickets.
   Correct parsing of DUID from config file, previously the LL type

diff --git a/client/scripts/linux b/client/scripts/linux
index 14655f04aa5c181d0874a4708b32610931c8a7f6..e6792c67d54692fe2113e0d10a548a21d7c8f24c 100755 (executable)
--- a/client/scripts/linux
+++ b/client/scripts/linux
@@ -275,12 +275,10 @@ if [ x$reason = xBOUND6 ] ; then
 fi
 
 if [ x$reason = xRENEW6 ] || [ x$reason = xREBIND6 ] ; then
-  if [ x${new_ip6_address} = x ] || [ x${new_ip6_prefixlen} = x ] ; then
-    exit_with_hooks 2;
-  fi
-
-  ${ip} -f inet6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
+  if [ x${new_ip6_address} != x ] && [ x${new_ip6_prefixlen} != x ] ; then
+    ${ip} -f inet6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
        dev ${interface} scope global
+  fi
 
   # Make sure nothing has moved around on us.
 

diff --git a/client/scripts/openwrt b/client/scripts/openwrt
index 8c3059a09a278d06dc835920bf541b2743d18032..55a4aa96d4b802c5e2a51b7457d15a8c2657d3a9 100755 (executable)
--- a/client/scripts/openwrt
+++ b/client/scripts/openwrt
@@ -244,13 +244,11 @@ if [ x$reason = xBOUND6 ]; then
 fi
 
 if [ x$reason = xRENEW6 ] || [ x$reason = xREBIND6 ]; then
-  if [ x${new_ip6_address} = x ] || [ x${new_ip6_prefixlen} = x ] ; then
-    exit_with_hooks 2;
+  if [ x${new_ip6_address} != x ] && [ x${new_ip6_prefixlen} != x ] ; then
+    ${ip} -f inet6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
+          dev ${interface} scope global
   fi
 
-  ${ip} -f inet6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
-       dev ${interface} scope global
-
   # Make sure nothing has moved around on us.
 
   # Nameservers/domains/etc.