[pkg-dhcp-commits] [isc-dhcp] 02/09: undefined variables in dhclient-script.kfreebsd

[Michael Gilbert]

This is an automated email from the git hooks/post-receive script.

mgilbert pushed a commit to branch master
in repository isc-dhcp.

commit e0f8fd6b0be2e841bca06a550bf00b05f0451da7
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sat Sep 5 18:37:10 2015 +0000

    undefined variables in dhclient-script.kfreebsd
---
 debian/changelog                |  2 ++
 debian/dhclient-script.kfreebsd | 14 ++++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 14eec67..673d15d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ isc-dhcp (4.3.2-2) UNRELEASED; urgency=medium
 
   * Add uversionmangle to debian/watch.
   * Restore Enhances field for the ldap package (closes: #790164).
+  * Fix undefined variables in dhclient-script.kfreebsd (closes: #691090).
+    - Thanks to Peter Marschall.
   * Make policycoreutils a dependency of isc-dhcp-server (closes: #797276).
 
  -- Michael Gilbert <mgilbert at debian.org>  Sat, 27 Jun 2015 15:31:48 +0000
diff --git a/debian/dhclient-script.kfreebsd b/debian/dhclient-script.kfreebsd
index 76f9cbf..addee80 100644
--- a/debian/dhclient-script.kfreebsd
+++ b/debian/dhclient-script.kfreebsd
@@ -171,9 +171,9 @@ case "$reason" in
         if [ -z "$old_ip_address" ] ||
            [ "$old_ip_address" != "$new_ip_address" ] ||
            [ "$reason" = "BOUND" ] || [ "$reason" = "REBOOT" ]; then
-	    # FIXME: metric_arg is not defined
             ifconfig $interface inet $new_ip_address ${new_subnet_mask:+netmask $new_subnet_mask} \
-                                ${new_broadcast_address:+broadcast $new_broadcast_address} $mtu_arg $metric_arg $medium
+                                ${new_broadcast_address:+broadcast $new_broadcast_address} \
+                                $mtu_arg ${IF_METRIC:+metric $IF_METRIC} $medium
             route add $new_ip_address 127.1 >/dev/null 2>&1
             for router in $new_routers; do
               # If the subnet is captive, eg the netmask is /32 but the default
@@ -248,8 +248,7 @@ case "$reason" in
         fi
 
         if [ -n "$alias_ip_address" ]; then
-	    # FIXME: alias_subnet_arg is not defined
-            ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg
+            ifconfig $interface inet alias $alias_ip_address ${alias_subnet_mask:+netmask $alias_subnet_mask}
             route add $alias_ip_address 127.0.0.1
         fi
 
@@ -261,9 +260,9 @@ case "$reason" in
             route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1
         fi
 
-	# FIXME: metric_arg is not defined
         ifconfig $interface inet $new_ip_address ${new_subnet_mask:+netmask $new_subnet_mask} \
-                              ${new_broadcast_address:+broadcast $new_broadcast_address} $mtu_arg $metric_arg $medium
+                              ${new_broadcast_address:+broadcast $new_broadcast_address} \
+                              $mtu_arg ${IF_METRIC:+metric $IF_METRIC} $medium
         sleep 1
 
 
@@ -272,8 +271,7 @@ case "$reason" in
           if ping -q -c 1 $1; then
             if [ x$new_ip_address != x$alias_ip_address ] && \
                               [ x$alias_ip_address != x ]; then
-	      # FIXME: alias_subnet_arg is not defined
-              ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg
+              ifconfig $interface inet alias $alias_ip_address ${alias_subnet_mask:+netmask $alias_subnet_mask}
               route add $alias_ip_address 127.0.0.1
             fi
             route add $new_ip_address 127.1 >/dev/null 2>&1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-dhcp/isc-dhcp.git