PERFORCE change 16685 for review

[Robert Watson]

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

Change 16685 by rwatson at rwatson_paprika on 2002/08/27 22:19:39

	Adopt sorting parallel to mac.h for pre_syscall, placing it
	with other process-related events.

Affected files ...

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

Differences ...

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

@@ -656,6 +656,10 @@
 		case MAC_CREATE_PROC1:
 			mpc->mpc_ops->mpo_create_proc1 = mpe->mpe_function;
 			break;
+		case MAC_PRE_SYSCALL_RETURN:
+			mpc->mpc_ops->mpo_pre_syscall_return =
+			    mpe->mpe_function;
+			break;
 		case MAC_RELABEL_CRED:
 			mpc->mpc_ops->mpo_relabel_cred =
 			    mpe->mpe_function;
@@ -856,10 +860,6 @@
 			mpc->mpc_ops->mpo_check_vnode_write =
 			    mpe->mpe_function;
 			break;
-		case MAC_PRE_SYSCALL_RETURN:
-			mpc->mpc_ops->mpo_pre_syscall_return =
-			    mpe->mpe_function;
-			break;
 /*
 		default:
 			printf("MAC policy `%s': unknown operation %d\n",
@@ -1330,6 +1330,13 @@
 	MAC_PERFORM(create_proc1, cred);
 }
 
+void
+mac_pre_syscall_return(void)
+{
+
+	MAC_PERFORM(pre_syscall_return);
+}
+
 /*
  * When a new process is created, its label must be initialized.  Generally,
  * this involves inheritence from the parent process, modulo possible
@@ -2933,13 +2940,6 @@
 	return (mac_externalize(&so->so_label, extmac));
 }
 
-void
-mac_pre_syscall_return(void)
-{
-
-	MAC_PERFORM(pre_syscall_return);
-}
-
 int
 mac_getsockopt_peerlabel_get(struct ucred *cred, struct socket *so,
     struct mac *extmac)
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message