From owner-svn-src-stable-10@FreeBSD.ORG  Wed Feb 11 02:43:59 2015
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 38E2E6B9;
 Wed, 11 Feb 2015 02:43:59 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 241CD8;
 Wed, 11 Feb 2015 02:43:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1B2hx3Z082990;
 Wed, 11 Feb 2015 02:43:59 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1B2hwMY082989;
 Wed, 11 Feb 2015 02:43:58 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201502110243.t1B2hwMY082989@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Wed, 11 Feb 2015 02:43:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r278550 - stable/10/etc/rc.d
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Feb 2015 02:43:59 -0000

Author: cy
Date: Wed Feb 11 02:43:58 2015
New Revision: 278550
URL: https://svnweb.freebsd.org/changeset/base/278550

Log:
  MFC r277854:
  
  ipfilter 5.1.2 (vs 4.1.28 in previous releases of FreeBSD) stores IPv4
  and IPv6 rules in a single table. ipf -6 -Fa will flush the whole table,
  including IPv4 rules. This patch removes the redundant ipf -I -6 -Fa
  statement.
  
  PR:		188318

Modified:
  stable/10/etc/rc.d/ipfilter
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/rc.d/ipfilter
==============================================================================
--- stable/10/etc/rc.d/ipfilter	Wed Feb 11 02:02:56 2015	(r278549)
+++ stable/10/etc/rc.d/ipfilter	Wed Feb 11 02:43:58 2015	(r278550)
@@ -65,7 +65,6 @@ ipfilter_reload()
 			err 1 'Load of rules into alternate set failed; aborting reload'
 		fi
 	fi
-	${ipfilter_program:-/sbin/ipf} -I -6 -Fa
 	if [ -r "${ipv6_ipfilter_rules}" ]; then
 		${ipfilter_program:-/sbin/ipf} -I -6 \
 		    -f "${ipv6_ipfilter_rules}" ${ipfilter_flags}