From: Thomas Markwalder <tmark@isc.org>
Date: Tue, 8 Jul 2014 17:14:19 +0000 (-0400)
Subject: [master] Squashed commit of the following:
X-Git-Tag: v4_3_1rc1~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7d9dd30689a3a3a2a65dbed56d18f77d1aa1b874;p=thirdparty%2Fdhcp.git

[master] Squashed commit of the following:

commit d911f58de00fd97f0e041cd12bd6b43804c32f4b
Author: Shawn Routhier <sar@isc.org>
Date:   Mon Jul 7 19:20:13 2014 -0700

    [rt36102] Add release note

commit 9dd4630b0653e7f7405a633e7f0163c163d3cb9a
Author: Thomas Markwalder <tmark@isc.org>
Date:   Mon Jul 7 09:11:35 2014 -0400

    [master] Patched client scripts for linux and openwrt

    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
---

diff --git a/RELNOTES b/RELNOTES
index 1b535c393..7eeba46ee 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -52,6 +52,13 @@ 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.3.1b1
+
+- 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]
+
 			Changes since 4.3.0
 
 - Tidy up several small tickets.
diff --git a/client/scripts/linux b/client/scripts/linux
index 14655f04a..e6792c67d 100755
--- 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 8c3059a09..55a4aa96d 100755
--- 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.