PERFORCE change 100741 for review
Robert Watson
rwatson at FreeBSD.org
Thu Jul 6 12:57:09 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=100741
Change 100741 by rwatson at rwatson_zoo on 2006/07/06 12:56:11
Further system v ipc renaming.
Affected files ...
.. //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#8 edit
.. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#17 edit
Differences ...
==== //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#8 (text+ko) ====
@@ -262,54 +262,54 @@
int mac_socket_setsockopt_label(struct ucred *cred, struct socket *so,
struct mac *extmac);
-void mac_sysv_msq_init(struct msqid_kernel*);
-void mac_sysv_msq_destroy(struct msqid_kernel *);
-void mac_sysv_msq_cleanup(struct msqid_kernel *msqkptr);
-void mac_sysv_msq_create_msg(struct ucred *cred,
+void mac_sysvmsq_init(struct msqid_kernel*);
+void mac_sysvmsq_destroy(struct msqid_kernel *);
+void mac_sysvmsq_cleanup(struct msqid_kernel *msqkptr);
+void mac_sysvmsq_create_msg(struct ucred *cred,
struct msqid_kernel *msqkptr, struct msg *msgptr);
-void mac_sysv_msq_create(struct ucred *cred,
+void mac_sysvmsq_create(struct ucred *cred,
struct msqid_kernel *msqkptr);
-int mac_sysv_msq_check_msgmsq(struct ucred *cred, struct msg *msgptr,
+int mac_sysvmsq_check_msgmsq(struct ucred *cred, struct msg *msgptr,
struct msqid_kernel *msqkptr);
-int mac_sysv_msq_check_msgrcv(struct ucred *cred, struct msg *msgptr);
-int mac_sysv_msq_check_msgrmid(struct ucred *cred, struct msg *msgptr);
-int mac_sysv_msq_check_msqget(struct ucred *cred,
+int mac_sysvmsq_check_msgrcv(struct ucred *cred, struct msg *msgptr);
+int mac_sysvmsq_check_msgrmid(struct ucred *cred, struct msg *msgptr);
+int mac_sysvmsq_check_msqget(struct ucred *cred,
struct msqid_kernel *msqkptr);
-int mac_sysv_msq_check_msqsnd(struct ucred *cred,
+int mac_sysvmsq_check_msqsnd(struct ucred *cred,
struct msqid_kernel *msqkptr);
-int mac_sysv_msq_check_msqrcv(struct ucred *cred,
+int mac_sysvmsq_check_msqrcv(struct ucred *cred,
struct msqid_kernel *msqkptr);
-int mac_sysv_msq_check_msqctl(struct ucred *cred,
+int mac_sysvmsq_check_msqctl(struct ucred *cred,
struct msqid_kernel *msqkptr, int cmd);
-void mac_sysv_msg_init(struct msg *);
-void mac_sysv_msg_destroy(struct msg *);
-void mac_sysv_msg_cleanup(struct msg *msgptr);
+void mac_sysvmsg_init(struct msg *);
+void mac_sysvmsg_destroy(struct msg *);
+void mac_sysvmsg_cleanup(struct msg *msgptr);
-void mac_sysv_sem_init(struct semid_kernel*);
-void mac_sysv_sem_destroy(struct semid_kernel *);
-void mac_sysv_sem_create(struct ucred *cred,
+void mac_sysvsem_init(struct semid_kernel*);
+void mac_sysvsem_destroy(struct semid_kernel *);
+void mac_sysvsem_create(struct ucred *cred,
struct semid_kernel *semakptr);
-void mac_sysv_sem_cleanup_sysv_sem(struct semid_kernel *semakptr);
-int mac_sysv_sem_check_semctl(struct ucred *cred,
+void mac_sysvsem_cleanup_sysvsem(struct semid_kernel *semakptr);
+int mac_sysvsem_check_semctl(struct ucred *cred,
struct semid_kernel *semakptr, int cmd);
-int mac_sysv_sem_check_semget(struct ucred *cred,
+int mac_sysvsem_check_semget(struct ucred *cred,
struct semid_kernel *semakptr);
-int mac_sysv_sem_check_semop(struct ucred *cred,
+int mac_sysvsem_check_semop(struct ucred *cred,
struct semid_kernel *semakptr, size_t accesstype);
-void mac_sysv_shm_init(struct shmid_kernel*);
-void mac_sysv_shm_destroy(struct shmid_kernel *);
-void mac_sysv_shm_create(struct ucred *cred,
+void mac_sysvshm_init(struct shmid_kernel*);
+void mac_sysvshm_destroy(struct shmid_kernel *);
+void mac_sysvshm_create(struct ucred *cred,
struct shmid_kernel *shmsegptr);
-void mac_sysv_shm_cleanup(struct shmid_kernel *shmsegptr);
-int mac_sysv_shm_check_shmat(struct ucred *cred,
+void mac_sysvshm_cleanup(struct shmid_kernel *shmsegptr);
+int mac_sysvshm_check_shmat(struct ucred *cred,
struct shmid_kernel *shmsegptr, int shmflg);
-int mac_sysv_shm_check_shmctl(struct ucred *cred,
+int mac_sysvshm_check_shmctl(struct ucred *cred,
struct shmid_kernel *shmsegptr, int cmd);
-int mac_sysv_shm_check_shmdt(struct ucred *cred,
+int mac_sysvshm_check_shmdt(struct ucred *cred,
struct shmid_kernel *shmsegptr);
-int mac_sysv_shm_check_shmget(struct ucred *cred,
+int mac_sysvshm_check_shmget(struct ucred *cred,
struct shmid_kernel *shmsegptr, int shmflg);
int mac_execve_enter(struct image_params *imgp, struct mac *mac_p);
==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#17 (text+ko) ====
@@ -390,72 +390,72 @@
/*
* Object: struct msqid_kernel (System V message queue)
*/
-typedef void (*mpo_sysv_msq_init_label_t)(struct label *label);
-typedef void (*mpo_sysv_msq_destroy_t)(struct label *label);
-typedef void (*mpo_sysv_msq_cleanup_t)(struct label *msqlabel);
-typedef void (*mpo_sysv_msq_create_msg_t)(struct ucred *cred,
+typedef void (*mpo_sysvmsq_init_label_t)(struct label *label);
+typedef void (*mpo_sysvmsq_destroy_t)(struct label *label);
+typedef void (*mpo_sysvmsq_cleanup_t)(struct label *msqlabel);
+typedef void (*mpo_sysvmsq_create_msg_t)(struct ucred *cred,
struct msqid_kernel *msqkptr, struct label *msqlabel,
struct msg *msgptr, struct label *msglabel);
-typedef void (*mpo_sysv_msq_create_t)(struct ucred *cred,
+typedef void (*mpo_sysvmsq_create_t)(struct ucred *cred,
struct msqid_kernel *msqkptr, struct label *msqlabel);
-typedef int (*mpo_sysv_msq_check_msgmsq_t)(struct ucred *cred,
+typedef int (*mpo_sysvmsq_check_msgmsq_t)(struct ucred *cred,
struct msg *msgptr, struct label *msglabel,
struct msqid_kernel *msqkptr, struct label *msqklabel);
-typedef int (*mpo_sysv_msq_check_msgrcv_t)(struct ucred *cred,
+typedef int (*mpo_sysvmsq_check_msgrcv_t)(struct ucred *cred,
struct msg *msgptr, struct label *msglabel);
-typedef int (*mpo_sysv_msq_check_msgrmid_t)(struct ucred *cred,
+typedef int (*mpo_sysvmsq_check_msgrmid_t)(struct ucred *cred,
struct msg *msgptr, struct label *msglabel);
-typedef int (*mpo_sysv_msq_check_msqget_t)(struct ucred *cred,
+typedef int (*mpo_sysvmsq_check_msqget_t)(struct ucred *cred,
struct msqid_kernel *msqkptr, struct label *msqklabel);
-typedef int (*mpo_sysv_msq_check_msqsnd_t)(struct ucred *cred,
+typedef int (*mpo_sysvmsq_check_msqsnd_t)(struct ucred *cred,
struct msqid_kernel *msqkptr, struct label *msqklabel);
-typedef int (*mpo_sysv_msq_check_msqrcv_t)(struct ucred *cred,
+typedef int (*mpo_sysvmsq_check_msqrcv_t)(struct ucred *cred,
struct msqid_kernel *msqkptr, struct label *msqklabel);
-typedef int (*mpo_sysv_msq_check_msqctl_t)(struct ucred *cred,
+typedef int (*mpo_sysvmsq_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_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);
+typedef void (*mpo_sysvmsg_init_label_t)(struct label *label);
+typedef void (*mpo_sysvmsg_destroy_label_t)(struct label *label);
+typedef void (*mpo_sysvmsg_cleanup_t)(struct label *msglabel);
/*
* Object: struct semid_kernel (System V IPC semaphore)
*/
-typedef void (*mpo_sysv_sem_init_label_t)(struct label *label);
-typedef void (*mpo_sysv_sem_destroy_label_t)(struct label *label);
-typedef void (*mpo_sysv_sem_cleanup_t)(struct label *semalabel);
-typedef void (*mpo_sysv_sem_create_t)(struct ucred *cred,
+typedef void (*mpo_sysvsem_init_label_t)(struct label *label);
+typedef void (*mpo_sysvsem_destroy_label_t)(struct label *label);
+typedef void (*mpo_sysvsem_cleanup_t)(struct label *semalabel);
+typedef void (*mpo_sysvsem_create_t)(struct ucred *cred,
struct semid_kernel *semakptr, struct label *semalabel);
-typedef int (*mpo_sysv_sem_check_semctl_t)(struct ucred *cred,
+typedef int (*mpo_sysvsem_check_semctl_t)(struct ucred *cred,
struct semid_kernel *semakptr, struct label *semaklabel,
int cmd);
-typedef int (*mpo_sysv_sem_check_semget_t)(struct ucred *cred,
+typedef int (*mpo_sysvsem_check_semget_t)(struct ucred *cred,
struct semid_kernel *semakptr, struct label *semaklabel);
-typedef int (*mpo_sysv_sem_check_semop_t)(struct ucred *cred,
+typedef int (*mpo_sysvsem_check_semop_t)(struct ucred *cred,
struct semid_kernel *semakptr, struct label *semaklabel,
size_t accesstype);
/*
* Object: struct shmid_kernel (System V shared memory segment)
*/
-typedef void (*mpo_sysv_shm_init_label_t)(struct label *label);
-typedef void (*mpo_sysv_shm_destroy_label_t)(struct label *label);
-typedef void (*mpo_sysv_shm_cleanup_t)(struct label *shmlabel);
-typedef void (*mpo_sysv_shm_create_t)(struct ucred *cred,
+typedef void (*mpo_sysvshm_init_label_t)(struct label *label);
+typedef void (*mpo_sysvshm_destroy_label_t)(struct label *label);
+typedef void (*mpo_sysvshm_cleanup_t)(struct label *shmlabel);
+typedef void (*mpo_sysvshm_create_t)(struct ucred *cred,
struct shmid_kernel *shmsegptr, struct label *shmlabel);
-typedef int (*mpo_sysv_shm_check_shmat_t)(struct ucred *cred,
+typedef int (*mpo_sysvshm_check_shmat_t)(struct ucred *cred,
struct shmid_kernel *shmsegptr,
struct label *shmseglabel, int shmflg);
-typedef int (*mpo_sysv_shm_check_shmctl_t)(struct ucred *cred,
+typedef int (*mpo_sysvshm_check_shmctl_t)(struct ucred *cred,
struct shmid_kernel *shmsegptr,
struct label *shmseglabel, int cmd);
-typedef int (*mpo_sysv_shm_check_shmdt_t)(struct ucred *cred,
+typedef int (*mpo_sysvshm_check_shmdt_t)(struct ucred *cred,
struct shmid_kernel *shmsegptr,
struct label *shmseglabel);
-typedef int (*mpo_sysv_shm_check_shmget_t)(struct ucred *cred,
+typedef int (*mpo_sysvshm_check_shmget_t)(struct ucred *cred,
struct shmid_kernel *shmsegptr,
struct label *shmseglabel, int shmflg);
@@ -798,43 +798,39 @@
mpo_proc_check_signal_t mpo_proc_check_signal;
mpo_proc_check_wait_t mpo_proc_check_wait;
- /*
- * XXXRW: These names are a bit awkard. Perhaps sysv_msq to match
- * conventional usage?
- */
- mpo_sysv_msq_init_label_t mpo_sysv_msq_init_label;
- mpo_sysv_msq_destroy_t mpo_sysv_msq_destroy;
- mpo_sysv_msq_cleanup_t mpo_sysv_msq_cleanup;
- mpo_sysv_msq_create_msg_t mpo_sysv_msq_create_msg;
- mpo_sysv_msq_create_t mpo_sysv_msq_create;
- mpo_sysv_msq_check_msgmsq_t mpo_sysv_msq_check_msgmsq;
- mpo_sysv_msq_check_msgrcv_t mpo_sysv_msq_check_msgrcv;
- mpo_sysv_msq_check_msgrmid_t mpo_sysv_msq_check_msgrmid;
- mpo_sysv_msq_check_msqget_t mpo_sysv_msq_check_msqget;
- mpo_sysv_msq_check_msqsnd_t mpo_sysv_msq_check_msqsnd;
- mpo_sysv_msq_check_msqrcv_t mpo_sysv_msq_check_msqrcv;
- mpo_sysv_msq_check_msqctl_t mpo_sysv_msq_check_msqctl;
+ mpo_sysvmsq_init_label_t mpo_sysvmsq_init_label;
+ mpo_sysvmsq_destroy_t mpo_sysvmsq_destroy;
+ mpo_sysvmsq_cleanup_t mpo_sysvmsq_cleanup;
+ mpo_sysvmsq_create_msg_t mpo_sysvmsq_create_msg;
+ mpo_sysvmsq_create_t mpo_sysvmsq_create;
+ mpo_sysvmsq_check_msgmsq_t mpo_sysvmsq_check_msgmsq;
+ mpo_sysvmsq_check_msgrcv_t mpo_sysvmsq_check_msgrcv;
+ mpo_sysvmsq_check_msgrmid_t mpo_sysvmsq_check_msgrmid;
+ mpo_sysvmsq_check_msqget_t mpo_sysvmsq_check_msqget;
+ mpo_sysvmsq_check_msqsnd_t mpo_sysvmsq_check_msqsnd;
+ mpo_sysvmsq_check_msqrcv_t mpo_sysvmsq_check_msqrcv;
+ mpo_sysvmsq_check_msqctl_t mpo_sysvmsq_check_msqctl;
- mpo_sysv_msg_init_label_t mpo_sysv_msg_init_label;
- mpo_sysv_msg_destroy_label_t mpo_sysv_msg_destroy_label;
- mpo_sysv_msg_cleanup_t mpo_sysv_msg_cleanup;
+ mpo_sysvmsg_init_label_t mpo_sysvmsg_init_label;
+ mpo_sysvmsg_destroy_label_t mpo_sysvmsg_destroy_label;
+ mpo_sysvmsg_cleanup_t mpo_sysvmsg_cleanup;
- mpo_sysv_sem_init_label_t mpo_sysv_sem_init_label;
- mpo_sysv_sem_destroy_label_t mpo_sysv_sem_destroy_label;
- mpo_sysv_sem_cleanup_t mpo_sysv_sem_cleanup;
- mpo_sysv_sem_create_t mpo_sysv_sem_create;
- mpo_sysv_sem_check_semctl_t mpo_sysv_sem_check_semctl;
- mpo_sysv_sem_check_semget_t mpo_sysv_sem_check_semget;
- mpo_sysv_sem_check_semop_t mpo_sysv_sem_check_semop;
+ mpo_sysvsem_init_label_t mpo_sysvsem_init_label;
+ mpo_sysvsem_destroy_label_t mpo_sysvsem_destroy_label;
+ mpo_sysvsem_cleanup_t mpo_sysvsem_cleanup;
+ mpo_sysvsem_create_t mpo_sysvsem_create;
+ mpo_sysvsem_check_semctl_t mpo_sysvsem_check_semctl;
+ mpo_sysvsem_check_semget_t mpo_sysvsem_check_semget;
+ mpo_sysvsem_check_semop_t mpo_sysvsem_check_semop;
- mpo_sysv_shm_init_label_t mpo_sysv_shm_init_label;
- mpo_sysv_shm_destroy_label_t mpo_sysv_shm_destroy_label;
- mpo_sysv_shm_cleanup_t mpo_sysv_shm_cleanup;
- mpo_sysv_shm_create_t mpo_sysv_shm_create;
- mpo_sysv_shm_check_shmat_t mpo_sysv_shm_check_shmat;
- mpo_sysv_shm_check_shmctl_t mpo_sysv_shm_check_shmctl;
- mpo_sysv_shm_check_shmdt_t mpo_sysv_shm_check_shmdt;
- mpo_sysv_shm_check_shmget_t mpo_sysv_shm_check_shmget;
+ mpo_sysvshm_init_label_t mpo_sysvshm_init_label;
+ mpo_sysvshm_destroy_label_t mpo_sysvshm_destroy_label;
+ mpo_sysvshm_cleanup_t mpo_sysvshm_cleanup;
+ mpo_sysvshm_create_t mpo_sysvshm_create;
+ mpo_sysvshm_check_shmat_t mpo_sysvshm_check_shmat;
+ mpo_sysvshm_check_shmctl_t mpo_sysvshm_check_shmctl;
+ mpo_sysvshm_check_shmdt_t mpo_sysvshm_check_shmdt;
+ mpo_sysvshm_check_shmget_t mpo_sysvshm_check_shmget;
/*
* XXXRW: Further naming consistency work is desirable here. Might
More information about the trustedbsd-cvs
mailing list