From fddc6e13299447bf47ca1ff3468390aea516a218 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Aug 11 2015 14:14:59 +0000
Subject: dhclient-script: respect DEFROUTE/GATEWAYDEV if Classless Static Routes are offered (#1251644)


---

diff --git a/dhclient-script b/dhclient-script
index 4138e90..c0d936a 100644
--- a/dhclient-script
+++ b/dhclient-script
@@ -409,11 +409,12 @@ dhconfig() {
             for((i=0; i<${#static_routes[@]}; i+=2)); do
                 target=${static_routes[$i]}
                 if [ -n "${new_classless_static_routes}" ]; then
+                    # If the DHCP server returns both a Classless Static Routes option and
+                    # a Router option, the DHCP client MUST ignore the Router option. (RFC3442)
+                    new_routers=""
                     if [ "${target}" = "0" ]; then
-                        # If the DHCP server returns both a Classless Static Routes option and
-                        # a Router option, the DHCP client MUST ignore the Router option. (RFC3442)
-                        new_routers=""
-                        prefix="0"
+                        new_routers="${static_routes[$i+1]}"
+                        continue
                     else
                         prefix=${target%%.*}
                         target=${target#*.}
diff --git a/dhcp.spec b/dhcp.spec
index 0155ec8..11c6489 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -18,7 +18,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.3.3
-Release:  0.1%{prever}%{?dist}
+Release:  0.2%{prever}%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -656,6 +656,9 @@ done
 %doc doc/html/
 
 %changelog
+* Tue Aug 11 2015 Jiri Popelka <jpopelka@redhat.com> - 12:4.3.3-0.2b1
+- dhclient-script: respect DEFROUTE/GATEWAYDEV if Classless Static Routes are offered (#1251644)
+
 * Mon Aug 10 2015 Jiri Popelka <jpopelka@redhat.com> - 12:4.3.3-0.1b1
 - 4.3.3b1
 - enable krb5/gssapi authentication for OpenLDAP