dhclient-script: respect DEFROUTE/GATEWAYDEV if Classless Static Routes are offered (#1251644)

This commit is contained in:
Jiri Popelka 2015-08-11 16:14:59 +02:00
parent d0384ed1b0
commit fddc6e1329
2 changed files with 9 additions and 5 deletions

View File

@ -409,11 +409,12 @@ dhconfig() {
for((i=0; i<${#static_routes[@]}; i+=2)); do for((i=0; i<${#static_routes[@]}; i+=2)); do
target=${static_routes[$i]} target=${static_routes[$i]}
if [ -n "${new_classless_static_routes}" ]; then if [ -n "${new_classless_static_routes}" ]; then
if [ "${target}" = "0" ]; then
# If the DHCP server returns both a Classless Static Routes option and # If the DHCP server returns both a Classless Static Routes option and
# a Router option, the DHCP client MUST ignore the Router option. (RFC3442) # a Router option, the DHCP client MUST ignore the Router option. (RFC3442)
new_routers="" new_routers=""
prefix="0" if [ "${target}" = "0" ]; then
new_routers="${static_routes[$i+1]}"
continue
else else
prefix=${target%%.*} prefix=${target%%.*}
target=${target#*.} target=${target#*.}

View File

@ -18,7 +18,7 @@
Summary: Dynamic host configuration protocol software Summary: Dynamic host configuration protocol software
Name: dhcp Name: dhcp
Version: 4.3.3 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 # NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to
# dcantrell maintaining the package) made incorrect use of the epoch and # 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. # 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/ %doc doc/html/
%changelog %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 * Mon Aug 10 2015 Jiri Popelka <jpopelka@redhat.com> - 12:4.3.3-0.1b1
- 4.3.3b1 - 4.3.3b1
- enable krb5/gssapi authentication for OpenLDAP - enable krb5/gssapi authentication for OpenLDAP