From owner-svn-src-all@FreeBSD.ORG  Mon Dec 19 13:14:58 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 283A21065678;
	Mon, 19 Dec 2011 13:14:58 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D1A528FC13;
	Mon, 19 Dec 2011 13:14:57 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBJDEvSw059069;
	Mon, 19 Dec 2011 13:14:57 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBJDEvhv059067;
	Mon, 19 Dec 2011 13:14:57 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201112191314.pBJDEvhv059067@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Mon, 19 Dec 2011 13:14:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228706 - releng/9.0/etc
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Dec 2011 13:14:58 -0000

Author: glebius
Date: Mon Dec 19 13:14:57 2011
New Revision: 228706
URL: http://svn.freebsd.org/changeset/base/228706

Log:
  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)

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

Modified: releng/9.0/etc/network.subr
==============================================================================
--- releng/9.0/etc/network.subr	Mon Dec 19 13:12:37 2011	(r228705)
+++ releng/9.0/etc/network.subr	Mon Dec 19 13:14:57 2011	(r228706)
@@ -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