From d2e049a37b727b9d06c06c7069d6d9dc010cd567 Mon Sep 17 00:00:00 2001
From: glebius <glebius@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Mon, 19 Dec 2011 13:14:57 +0000
Subject: [PATCH] Merge r228472. For the sake of POLA for the whole 9.x
 timeline add compatibility support for specifing IPv4 aliases in rc.conf
 without the "inet" keyword.

Approved by:	re (bz)


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

diff --git a/etc/network.subr b/etc/network.subr
index c1faf59b..070f8849 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -716,9 +716,16 @@ ifalias_ipv4_up()
 		inet\ *)
 			ifconfig $1 ${ifconfig_args} alias && _ret=0
 			;;
+		inet6\ *)
+			;;
 		"")
 			break
 			;;
+		*)
+			warn "\$ifconfig_$1_alias${alias} needs " \
+			    "\"inet\" keyword for an IPv4 address."
+			ifconfig $1 ${ifconfig_args} alias && _ret=0
+			;;
 		esac
 		alias=$((${alias} + 1))
 	done
-- 
2.42.0