svn commit: r228705 - stable/9/etc

[Gleb Smirnoff]

Author: glebius
Date: Mon Dec 19 13:12:37 2011
New Revision: 228705
URL: http://svn.freebsd.org/changeset/base/228705

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:
  stable/9/etc/network.subr
Directory Properties:
  stable/9/etc/   (props changed)

Modified: stable/9/etc/network.subr
==============================================================================
--- stable/9/etc/network.subr	Mon Dec 19 12:51:12 2011	(r228704)
+++ stable/9/etc/network.subr	Mon Dec 19 13:12:37 2011	(r228705)
@@ -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