From owner-p4-projects  Thu Aug  8 23:20: 8 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9AF5E37B401; Thu,  8 Aug 2002 23:19:58 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3708A37B400
	for <perforce@freebsd.org>; Thu,  8 Aug 2002 23:19:58 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E6C8343E6A
	for <perforce@freebsd.org>; Thu,  8 Aug 2002 23:19:57 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g796JvJU010780
	for <perforce@freebsd.org>; Thu, 8 Aug 2002 23:19:57 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g796Jvlg010777
	for perforce@freebsd.org; Thu, 8 Aug 2002 23:19:57 -0700 (PDT)
Date: Thu, 8 Aug 2002 23:19:57 -0700 (PDT)
Message-Id: <200208090619.g796Jvlg010777@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 15716 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15716

Change 15716 by rwatson@rwatson_paprika on 2002/08/08 23:19:27

	Catch additional mac_policy() -> mac_syscall() from the integ.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#233 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#233 (text+ko) ====

@@ -371,7 +371,7 @@
 			 */
 			break;
 		case MAC_SYSCALL:
-			mpc->mpc_ops->mpo_mac_policy =
+			mpc->mpc_ops->mpo_mac_syscall =
 			    mpe->mpe_function;
 			break;
 		case MAC_DESTROY:
@@ -3128,7 +3128,7 @@
  * MPSAFE
  */
 int
-mac_policy(struct thread *td, struct mac_policy_args *uap)
+mac_syscall(struct thread *td, struct mac_syscall_args *uap)
 {
 	int error;
 	char target[128]; /* TBD: should be MAX_MAXNAME or some such */
@@ -3146,8 +3146,8 @@
 	MAC_POLICY_LIST_BUSY();
 	LIST_FOREACH(mpc, &mac_policy_list, mpc_list) {
 		if (strcmp(mpc->mpc_name, target) == 0 &&
-			mpc->mpc_ops->mpo_mac_policy) {
-			error = mpc->mpc_ops->mpo_mac_policy(SCARG(uap, call),
+			mpc->mpc_ops->mpo_mac_syscall) {
+			error = mpc->mpc_ops->mpo_mac_syscall(SCARG(uap, call),
 							     SCARG(uap, arg));
 			goto out;
 		}
@@ -3206,7 +3206,7 @@
 }
 
 int
-mac_policy(struct thread *td, struct mac_policy_args *uap)
+mac_syscall(struct thread *td, struct mac_policy_args *uap)
 {
 
 	return (ENOSYS);

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message