From owner-p4-projects@FreeBSD.ORG Fri Jul 9 17:45:04 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9525616A4D0; Fri, 9 Jul 2004 17:45:04 +0000 (GMT) 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 7163C16A4CE for ; Fri, 9 Jul 2004 17:45:04 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5576143D1D for ; Fri, 9 Jul 2004 17:45:03 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i69Hj3GB086921 for ; Fri, 9 Jul 2004 17:45:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i69Hj3cH086918 for perforce@freebsd.org; Fri, 9 Jul 2004 17:45:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 9 Jul 2004 17:45:03 GMT Message-Id: <200407091745.i69Hj3cH086918@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 56909 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Jul 2004 17:45:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=56909 Change 56909 by rwatson@rwatson_tislabs on 2004/07/09 17:44:16 Forward declare System V IPC structures. Remove trailing white space. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#214 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#214 (text+ko) ==== @@ -63,9 +63,12 @@ struct mac_policy_conf; struct mbuf; struct mount; +struct msqid_kernel; struct pipepair; struct proc; struct sbuf; +struct semid_kernel; +struct shmid_kernel; struct sockaddr; struct socket; struct sysctl_oid; @@ -237,19 +240,17 @@ void (*mpo_create_pipe)(struct ucred *cred, struct pipepair *pp, struct label *pipelabel); - /* + /* * Labeling event operations: System V IPC primitives. */ - void (*mpo_create_ipc_msgmsg)(struct ucred *cred, - struct msqid_kernel *msqkptr, - struct label *msqlabel, - struct msg *msgptr, - struct label *msglabel); - void (*mpo_create_ipc_msgqueue)(struct ucred *cred, + void (*mpo_create_ipc_msgmsg)(struct ucred *cred, + struct msqid_kernel *msqkptr, struct label *msqlabel, + struct msg *msgptr, struct label *msglabel); + void (*mpo_create_ipc_msgqueue)(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqlabel); - void (*mpo_create_ipc_sema)(struct ucred *cred, - struct semid_kernel *semakptr, struct label *semalabel); - void (*mpo_create_ipc_shm)(struct ucred *cred, + void (*mpo_create_ipc_sema)(struct ucred *cred, + struct semid_kernel *semakptr, struct label *semalabel); + void (*mpo_create_ipc_shm)(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmlabel); /* @@ -371,21 +372,21 @@ int (*mpo_check_ipc_semctl)(struct ucred *cred, struct semid_kernel *semakptr, struct label *semaklabel, int cmd); - int (*mpo_check_ipc_semget)(struct ucred *cred, + int (*mpo_check_ipc_semget)(struct ucred *cred, struct semid_kernel *semakptr, struct label *semaklabel); int (*mpo_check_ipc_semop)(struct ucred *cred, struct semid_kernel *semakptr, struct label *semaklabel, size_t accesstype); - int (*mpo_check_ipc_shmat)(struct ucred *cred, + int (*mpo_check_ipc_shmat)(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmseglabel, int shmflg); - int (*mpo_check_ipc_shmctl)(struct ucred *cred, + int (*mpo_check_ipc_shmctl)(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmseglabel, int cmd); - int (*mpo_check_ipc_shmdt)(struct ucred *cred, + int (*mpo_check_ipc_shmdt)(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmseglabel); - int (*mpo_check_ipc_shmget)(struct ucred *cred, + int (*mpo_check_ipc_shmget)(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmseglabel, int shmflg); int (*mpo_check_kenv_dump)(struct ucred *cred); @@ -401,7 +402,7 @@ struct label *mntlabel); int (*mpo_check_pipe_ioctl)(struct ucred *cred, struct pipepair *pp, struct label *pipelabel, - unsigned long cmd, void *data); + unsigned long cmd, void *data); int (*mpo_check_pipe_poll)(struct ucred *cred, struct pipepair *pp, struct label *pipelabel); int (*mpo_check_pipe_read)(struct ucred *cred, @@ -413,19 +414,19 @@ struct pipepair *pp, struct label *pipelabel); int (*mpo_check_pipe_write)(struct ucred *cred, struct pipepair *pp, struct label *pipelabel); - int (*mpo_check_posix_sem_close)(struct ucred *cred, + int (*mpo_check_posix_sem_close)(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label); - int (*mpo_check_posix_sem_destroy)(struct ucred *cred, + int (*mpo_check_posix_sem_destroy)(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label); - int (*mpo_check_posix_sem_getvalue)(struct ucred *cred, + int (*mpo_check_posix_sem_getvalue)(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label); - int (*mpo_check_posix_sem_openexisting)(struct ucred *cred, + int (*mpo_check_posix_sem_openexisting)(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label); - int (*mpo_check_posix_sem_post)(struct ucred *cred, + int (*mpo_check_posix_sem_post)(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label); - int (*mpo_check_posix_sem_unlink)(struct ucred *cred, + int (*mpo_check_posix_sem_unlink)(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label); - int (*mpo_check_posix_sem_wait)(struct ucred *cred, + int (*mpo_check_posix_sem_wait)(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label); int (*mpo_check_proc_debug)(struct ucred *cred, struct proc *proc);