From owner-svn-src-all@freebsd.org  Tue Jan 21 17:02:58 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 6CEA01FC42E;
 Tue, 21 Jan 2020 17:02:58 +0000 (UTC)
 (envelope-from eugen@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)
 server-signature RSA-PSS (4096 bits)
 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 482FGV2339z3JTl;
 Tue, 21 Jan 2020 17:02:58 +0000 (UTC)
 (envelope-from eugen@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 419F8FDEC;
 Tue, 21 Jan 2020 17:02:58 +0000 (UTC)
 (envelope-from eugen@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00LH2wTJ050406;
 Tue, 21 Jan 2020 17:02:58 GMT (envelope-from eugen@FreeBSD.org)
Received: (from eugen@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00LH2wTr050405;
 Tue, 21 Jan 2020 17:02:58 GMT (envelope-from eugen@FreeBSD.org)
Message-Id: <202001211702.00LH2wTr050405@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: eugen set sender to
 eugen@FreeBSD.org using -f
From: Eugene Grosbein <eugen@FreeBSD.org>
Date: Tue, 21 Jan 2020 17:02:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r356943 - head/libexec/rc/rc.d
X-SVN-Group: head
X-SVN-Commit-Author: eugen
X-SVN-Commit-Paths: head/libexec/rc/rc.d
X-SVN-Commit-Revision: 356943
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.29
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: Tue, 21 Jan 2020 17:02:58 -0000

Author: eugen
Date: Tue Jan 21 17:02:57 2020
New Revision: 356943
URL: https://svnweb.freebsd.org/changeset/base/356943

Log:
  Correct "service ipfw status" for INET6-only systems.
  
  MFC after:	1 month

Modified:
  head/libexec/rc/rc.d/ipfw

Modified: head/libexec/rc/rc.d/ipfw
==============================================================================
--- head/libexec/rc/rc.d/ipfw	Tue Jan 21 16:31:08 2020	(r356942)
+++ head/libexec/rc/rc.d/ipfw	Tue Jan 21 17:02:57 2020	(r356943)
@@ -127,6 +127,9 @@ ipfw_stop()
 ipfw_status()
 {
 	status=$(sysctl -i -n net.inet.ip.fw.enable)
+	if afexists inet6; then
+		status=$(( $status + $(sysctl -i -n net.inet6.ip6.fw.enable) ))
+	fi
 	if [ ${status:-0} -eq 0 ]; then
 		echo "ipfw is not enabled"
 		exit 1