From owner-p4-projects  Mon Aug 19 13: 0:39 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9192C37B407; Mon, 19 Aug 2002 13:00:16 -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 338A237B400
	for <perforce@freebsd.org>; Mon, 19 Aug 2002 13:00:16 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8413643E6A
	for <perforce@freebsd.org>; Mon, 19 Aug 2002 13:00:15 -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 g7JK0FJU044012
	for <perforce@freebsd.org>; Mon, 19 Aug 2002 13:00:15 -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 g7JK0Fp8044009
	for perforce@freebsd.org; Mon, 19 Aug 2002 13:00:15 -0700 (PDT)
Date: Mon, 19 Aug 2002 13:00:15 -0700 (PDT)
Message-Id: <200208192000.g7JK0Fp8044009@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 16293 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=16293

Change 16293 by rwatson@rwatson_paprika on 2002/08/19 13:00:09

	Improve naming consistency relating to mac_syscall: change
	instances of mpo_mac_syscall to mpo_syscall.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#250 edit
.. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#119 edit

Differences ...

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

@@ -373,10 +373,6 @@
 			 * that all enumerated values are handled.
 			 */
 			break;
-		case MAC_SYSCALL:
-			mpc->mpc_ops->mpo_mac_syscall =
-			    mpe->mpe_function;
-			break;
 		case MAC_DESTROY:
 			mpc->mpc_ops->mpo_destroy =
 			    mpe->mpe_function;
@@ -385,6 +381,10 @@
 			mpc->mpc_ops->mpo_init =
 			    mpe->mpe_function;
 			break;
+		case MAC_SYSCALL:
+			mpc->mpc_ops->mpo_syscall =
+			    mpe->mpe_function;
+			break;
 		case MAC_INIT_BPFDESC:
 			mpc->mpc_ops->mpo_init_bpfdesc =
 			    mpe->mpe_function;
@@ -3301,10 +3301,9 @@
 	MAC_POLICY_LIST_BUSY();
 	LIST_FOREACH(mpc, &mac_policy_list, mpc_list) {
 		if (strcmp(mpc->mpc_name, target) == 0 &&
-			mpc->mpc_ops->mpo_mac_syscall) {
-			error = mpc->mpc_ops->mpo_mac_syscall(td, 
-							      SCARG(uap, call),
-							      SCARG(uap, arg));
+			mpc->mpc_ops->mpo_syscall) {
+			error = mpc->mpc_ops->mpo_syscall(td, 
+			    SCARG(uap, call), SCARG(uap, arg));
 			goto out;
 		}
 	}

==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#119 (text+ko) ====

@@ -63,9 +63,11 @@
 	void	(*mpo_init)(struct mac_policy_conf *mpc);
 
 	/*
-	 * Generic policy-directed security syscall
+	 * General policy-directed security system call so that policies
+	 * may implement new services without reserving explicit
+	 * system call numbers.
 	 */
-	int	(*mpo_mac_syscall)(struct thread *td, int call, void *arg);
+	int	(*mpo_syscall)(struct thread *td, int call, void *arg);
 
 	/*
 	 * Label operations.
@@ -351,9 +353,9 @@
 
 enum mac_op_constant {
 	MAC_OP_LAST,
-	MAC_SYSCALL,
 	MAC_DESTROY,
 	MAC_INIT,
+	MAC_SYSCALL,
 	MAC_INIT_BPFDESC,
 	MAC_INIT_CRED,
 	MAC_INIT_DEVFSDIRENT,

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