From owner-svn-src-all@freebsd.org  Thu Jul 23 15:03:29 2020
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4155E359132;
 Thu, 23 Jul 2020 15:03:29 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4BCFvj12DLz4g5r;
 Thu, 23 Jul 2020 15:03:29 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 072111AB73;
 Thu, 23 Jul 2020 15:03:29 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06NF3Sba030709;
 Thu, 23 Jul 2020 15:03:28 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06NF3S3R030708;
 Thu, 23 Jul 2020 15:03:28 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <202007231503.06NF3S3R030708@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Thu, 23 Jul 2020 15:03:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r363449 - head/libexec/rc
X-SVN-Group: head
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: head/libexec/rc
X-SVN-Commit-Revision: 363449
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.33
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: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Jul 2020 15:03:29 -0000

Author: markj
Date: Thu Jul 23 15:03:28 2020
New Revision: 363449
URL: https://svnweb.freebsd.org/changeset/base/363449

Log:
  rc.firewall: Merge two identical conditions into one.
  
  No functional change intended.
  
  PR:		247949
  Submitted by:	Jose Luis Duran <jlduran@gmail.com>
  MFC after:	1 week

Modified:
  head/libexec/rc/rc.firewall

Modified: head/libexec/rc/rc.firewall
==============================================================================
--- head/libexec/rc/rc.firewall	Thu Jul 23 14:33:25 2020	(r363448)
+++ head/libexec/rc/rc.firewall	Thu Jul 23 15:03:28 2020	(r363449)
@@ -222,9 +222,6 @@ case ${firewall_type} in
 	if [ -n "$net6" ]; then
 		${fwcmd} add pass all from me to ${net6}
 		${fwcmd} add pass all from ${net6} to me
-	fi
-
-	if [ -n "$net6" ]; then
 		# Allow any link-local multicast traffic
 		${fwcmd} add pass all from fe80::/10 to ff02::/16
 		${fwcmd} add pass all from ${net6} to ff02::/16