svn commit: r227910 - releng/9.0/etc stable/9/etc

[Xin LI]

Author: delphij
Date: Wed Nov 23 21:41:31 2011
New Revision: 227910
URL: http://svn.freebsd.org/changeset/base/227910

Log:
  MFC r225849:
  
  Test if the interface is afif in dhcpif() and syncdhcpif(), as
  done in ipv6_autoconfif.
  
  This fixes a regression that causes e.g. ifconfig_DEFAULT="DHCP"
  to run on non-afif interfaces like pfsync0, which in turn would
  cause excessive delay on system startup.
  
  Sponsored by:	iXsystems, Inc.
  Reviewed by:	hrs (freebsd-rc@)
  Approved by:	re (bz)

Modified:
  releng/9.0/etc/network.subr
Directory Properties:
  releng/9.0/etc/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/9/etc/network.subr
Directory Properties:
  stable/9/etc/   (props changed)

Modified: releng/9.0/etc/network.subr
==============================================================================
--- releng/9.0/etc/network.subr	Wed Nov 23 21:19:38 2011	(r227909)
+++ releng/9.0/etc/network.subr	Wed Nov 23 21:41:31 2011	(r227910)
@@ -297,6 +297,10 @@ dhcpif()
 	local _tmpargs _arg
 	_tmpargs=`_ifconfig_getargs $1`
 
+	if noafif $1; then
+		return 1
+	fi
+
 	for _arg in $_tmpargs; do
 		case $_arg in
 		[Dd][Hh][Cc][Pp])
@@ -322,6 +326,10 @@ syncdhcpif()
 	local _tmpargs _arg
 	_tmpargs=`_ifconfig_getargs $1`
 
+	if noafif $1; then
+		return 1
+	fi
+
 	for _arg in $_tmpargs; do
 		case $_arg in
 		[Nn][Oo][Ss][Yy][Nn][Cc][Dd][Hh][Cc][Pp])