From owner-svn-src-head@FreeBSD.ORG  Fri Aug 23 23:12:17 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 2FCECE80;
 Fri, 23 Aug 2013 23:12:17 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1D0F02B25;
 Fri, 23 Aug 2013 23:12:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7NNCGpo056593;
 Fri, 23 Aug 2013 23:12:16 GMT (envelope-from asomers@svn.freebsd.org)
Received: (from asomers@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7NNCGMU056592;
 Fri, 23 Aug 2013 23:12:16 GMT (envelope-from asomers@svn.freebsd.org)
Message-Id: <201308232312.r7NNCGMU056592@svn.freebsd.org>
From: Alan Somers <asomers@FreeBSD.org>
Date: Fri, 23 Aug 2013 23:12:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r254743 - head/etc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Aug 2013 23:12:17 -0000

Author: asomers
Date: Fri Aug 23 23:12:16 2013
New Revision: 254743
URL: http://svnweb.freebsd.org/changeset/base/254743

Log:
  Correctly remove an interface's ipv4 address when the user calls
  "/etc/rc.d/netif stop XXX".  The old globbing pattern failed to account for the
  possibility of a tab occuring before "inet".
  
  Reviewed by:	will
  Approved by:	ken (mentor, implicit)
  MFC after:	Never (bug affects head only)
  Sponsored by:	Spectra Logic

Modified:
  head/etc/network.subr

Modified: head/etc/network.subr
==============================================================================
--- head/etc/network.subr	Fri Aug 23 22:55:52 2013	(r254742)
+++ head/etc/network.subr	Fri Aug 23 23:12:16 2013	(r254743)
@@ -661,9 +661,9 @@ ipv4_down()
 	for _inet in $inetList ; do
 		# get rid of extraneous line
 		case $_inet in
-		"")		break ;;
-		inet\ *)	;;
-		*)		continue ;;
+		"")				break ;;
+		\	inet\ *|inet\ *)	;;
+		*)				continue ;;
 		esac
 		[ -z "$_inet" ] && break