From owner-svn-src-all@freebsd.org  Mon Mar  5 12:21:37 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3889FF2A076;
 Mon,  5 Mar 2018 12:21:37 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id D8B7A76C66;
 Mon,  5 Mar 2018 12:21:36 +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 D3BC423CA6;
 Mon,  5 Mar 2018 12:21:36 +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 w25CLaKv035763;
 Mon, 5 Mar 2018 12:21:36 GMT (envelope-from eugen@FreeBSD.org)
Received: (from eugen@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w25CLafg035744;
 Mon, 5 Mar 2018 12:21:36 GMT (envelope-from eugen@FreeBSD.org)
Message-Id: <201803051221.w25CLafg035744@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: Mon, 5 Mar 2018 12:21:36 +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: r330500 - stable/10/sys/security/mac_portacl
X-SVN-Group: stable-10
X-SVN-Commit-Author: eugen
X-SVN-Commit-Paths: stable/10/sys/security/mac_portacl
X-SVN-Commit-Revision: 330500
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.25
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: Mon, 05 Mar 2018 12:21:37 -0000

Author: eugen
Date: Mon Mar  5 12:21:36 2018
New Revision: 330500
URL: https://svnweb.freebsd.org/changeset/base/330500

Log:
  MFC r329994: mac_portacl(4): stop panicing INVARIANTS-enabled kernel by loading .ko
  when kernel already has options MAC_PORTACL.
  
  PR:		183817
  Approved by:	avg (mentor)

Modified:
  stable/10/sys/security/mac_portacl/mac_portacl.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/security/mac_portacl/mac_portacl.c
==============================================================================
--- stable/10/sys/security/mac_portacl/mac_portacl.c	Mon Mar  5 12:16:37 2018	(r330499)
+++ stable/10/sys/security/mac_portacl/mac_portacl.c	Mon Mar  5 12:21:36 2018	(r330500)
@@ -493,3 +493,4 @@ static struct mac_policy_ops portacl_ops =
 
 MAC_POLICY_SET(&portacl_ops, mac_portacl, "TrustedBSD MAC/portacl",
     MPC_LOADTIME_FLAG_UNLOADOK, NULL);
+MODULE_VERSION(mac_portacl, 1);