PERFORCE change 100661 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=100661

Change 100661 by rwatson at rwatson_zoo on 2006/07/05 22:01:58

	More renaming.  Not happy with sysvipc names yet.

Affected files ...

.. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#5 edit

Differences ...

==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#5 (text+ko) ====

@@ -324,34 +324,34 @@
 typedef void	(*mpo_sysv_msgqueue_init_label_t)(struct label *label);
 typedef void	(*mpo_sysv_msgqueue_destroy_t)(struct label *label);
 typedef void	(*mpo_sysv_msgqueue_cleanup_t)(struct label *msqlabel);
-typedef void	(*mpo_sysv_msgmsg_create_t)(struct ucred *cred,
+typedef void	(*mpo_sysv_msgqueue_create_msg_t)(struct ucred *cred,
 		    struct msqid_kernel *msqkptr, struct label *msqlabel,
 		    struct msg *msgptr, struct label *msglabel);
 typedef void	(*mpo_sysv_msgqueue_create_t)(struct ucred *cred,
 		    struct msqid_kernel *msqkptr, struct label *msqlabel);
 
-typedef int	(*mpo_check_sysv_msgmsq_t)(struct ucred *cred,
+typedef int	(*mpo_sysv_msgqueue_check_msgmsq_t)(struct ucred *cred,
 		    struct msg *msgptr, struct label *msglabel,
 		    struct msqid_kernel *msqkptr, struct label *msqklabel);
-typedef int	(*mpo_check_sysv_msgrcv_t)(struct ucred *cred,
+typedef int	(*mpo_sysv_msgqueue_check_msgrcv_t)(struct ucred *cred,
 		    struct msg *msgptr, struct label *msglabel);
-typedef int	(*mpo_check_sysv_msgrmid_t)(struct ucred *cred,
+typedef int	(*mpo_sysv_msgqueue_check_msgrmid_t)(struct ucred *cred,
 		    struct msg *msgptr, struct label *msglabel);
-typedef int	(*mpo_check_sysv_msqget_t)(struct ucred *cred,
+typedef int	(*mpo_sysv_msgqueue_check_msqget_t)(struct ucred *cred,
 		    struct msqid_kernel *msqkptr, struct label *msqklabel);
-typedef int	(*mpo_check_sysv_msqsnd_t)(struct ucred *cred,
+typedef int	(*mpo_sysv_msgqueue_check_msqsnd_t)(struct ucred *cred,
 		    struct msqid_kernel *msqkptr, struct label *msqklabel);
-typedef int	(*mpo_check_sysv_msqrcv_t)(struct ucred *cred,
+typedef int	(*mpo_sysv_msgqueue_check_msqrcv_t)(struct ucred *cred,
 		    struct msqid_kernel *msqkptr, struct label *msqklabel);
-typedef int	(*mpo_check_sysv_msqctl_t)(struct ucred *cred,
+typedef int	(*mpo_sysv_msgqueue_check_msqctl_t)(struct ucred *cred,
 		    struct msqid_kernel *msqkptr, struct label *msqklabel,
 		    int cmd);
 /*
  * Object: struct msg (System V message)
  */
-typedef void	(*mpo_sysv_msgmsg_init_label_t)(struct label *label);
-typedef void	(*mpo_sysv_msgmsg_destroy_label_t)(struct label *label);
-typedef void	(*mpo_sysv_msgmsg_cleanup_t)(struct label *msglabel);
+typedef void	(*mpo_sysv_msg_init_label_t)(struct label *label);
+typedef void	(*mpo_sysv_msg_destroy_label_t)(struct label *label);
+typedef void	(*mpo_sysv_msg_cleanup_t)(struct label *msglabel);
 
 /*
  * Object: struct pipepair (Pipe)
@@ -439,16 +439,16 @@
 typedef void	(*mpo_sysv_shm_cleanup_t)(struct label *shmlabel);
 typedef void	(*mpo_sysv_shm_create_t)(struct ucred *cred,
 		    struct shmid_kernel *shmsegptr, struct label *shmlabel);
-typedef int	(*mpo_check_sysv_shmat_t)(struct ucred *cred,
+typedef int	(*mpo_sysv_shm_check_shmat_t)(struct ucred *cred,
 		    struct shmid_kernel *shmsegptr,
 		    struct label *shmseglabel, int shmflg);
-typedef int	(*mpo_check_sysv_shmctl_t)(struct ucred *cred,
+typedef int	(*mpo_sysv_shm_check_shmctl_t)(struct ucred *cred,
 		    struct shmid_kernel *shmsegptr,
 		    struct label *shmseglabel, int cmd);
-typedef int	(*mpo_check_sysv_shmdt_t)(struct ucred *cred,
+typedef int	(*mpo_sysv_shm_check_shmdt_t)(struct ucred *cred,
 		    struct shmid_kernel *shmsegptr,
 		    struct label *shmseglabel);
-typedef int	(*mpo_check_sysv_shmget_t)(struct ucred *cred,
+typedef int	(*mpo_sysv_shm_check_shmget_t)(struct ucred *cred,
 		    struct shmid_kernel *shmsegptr,
 		    struct label *shmseglabel, int shmflg);
 
@@ -662,8 +662,8 @@
 	/*
 	 * Policy module operations.
 	 */
-	mpo_destroy_t				mpo_destroy;
-	mpo_init_t				mpo_init;
+	mpo_policy_destroy_t				mpo_policy_destroy;
+	mpo_policy_init_t				mpo_policy_init;
 
 	/*
 	 * General policy-directed security system call so that policies may