From 1636371c5fdc7f3914a23ee2a9881b5cf8e93d55 Mon Sep 17 00:00:00 2001
From: delphij <delphij@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Wed, 23 Nov 2011 21:41:31 +0000
Subject: [PATCH] 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)


git-svn-id: svn://svn.freebsd.org/base/releng/9.0@227910 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 etc/network.subr | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/etc/network.subr b/etc/network.subr
index 579c7018..d595b794 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -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])
-- 
2.42.0