PERFORCE change 16293 for review

[Robert Watson]

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

Change 16293 by rwatson at 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 at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message