Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 6 Jul 2006 10:18:16 GMT
From:      Robert Watson <rwatson@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 100711 for review
Message-ID:  <200607061018.k66AIGiL061524@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=100711

Change 100711 by rwatson@rwatson_zoo on 2006/07/06 10:18:02

	Much renaming.

Affected files ...

.. //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#4 edit

Differences ...

==== //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#4 (text+ko) ====

@@ -90,173 +90,177 @@
  * Kernel functions to manage and evaluate labels.
  */
 
-void	mac_init_bpfdesc(struct bpf_d *);
-void	mac_destroy_bpfdesc(struct bpf_d *);
-void	mac_create_bpfdesc(struct ucred *cred, struct bpf_d *bpf_d);
-void	mac_create_mbuf_from_bpfdesc(struct bpf_d *bpf_d, struct mbuf *m);
-int	mac_check_bpfdesc_receive(struct bpf_d *bpf_d, struct ifnet *ifnet);
+void	mac_bpfdesc_init(struct bpf_d *);
+void	mac_bpfdesc_destroy(struct bpf_d *);
+void	mac_bpfdesc_create(struct ucred *cred, struct bpf_d *bpf_d);
+void	mac_bpfdesc_create_mbuf(struct bpf_d *bpf_d, struct mbuf *m);
+int	mac_bpfdesc_check_receive(struct bpf_d *bpf_d, struct ifnet *ifnet);
 
-void	mac_init_devfsdirent(struct devfs_dirent *);
-void	mac_destroy_devfsdirent(struct devfs_dirent *);
-void	mac_associate_vnode_devfs(struct mount *mp, struct devfs_dirent *de,
+void	mac_devfsdirent_init(struct devfs_dirent *);
+void	mac_devfsdirent_destroy(struct devfs_dirent *);
+void	mac_devfs_vnode_associate(struct mount *mp, struct devfs_dirent *de,
 	    struct vnode *vp);
-void	mac_create_devfs_device(struct ucred *cred, struct mount *mp,
+void	mac_devfs_create_device(struct ucred *cred, struct mount *mp,
 	    struct cdev *dev, struct devfs_dirent *de);
-void	mac_create_devfs_directory(struct mount *mp, char *dirname,
+void	mac_devfs_create_directory(struct mount *mp, char *dirname,
 	    int dirnamelen, struct devfs_dirent *de);
-void	mac_create_devfs_symlink(struct ucred *cred, struct mount *mp,
+void	mac_devfs_create_symlink(struct ucred *cred, struct mount *mp,
 	    struct devfs_dirent *dd, struct devfs_dirent *de);
-void	mac_update_devfsdirent(struct mount *mp, struct devfs_dirent *de,
+void	mac_devfsdirent_update(struct mount *mp, struct devfs_dirent *de,
 	    struct vnode *vp);
 
-void	mac_init_cred(struct ucred *);
-void	mac_destroy_cred(struct ucred *);
-void	mac_copy_cred(struct ucred *cr1, struct ucred *cr2);
+void	mac_cred_init(struct ucred *);
+void	mac_cred_destroy(struct ucred *);
+void	mac_cred_copy(struct ucred *cr1, struct ucred *cr2);
 struct label	*mac_cred_label_alloc(void);
 void		 mac_cred_label_free(struct label *label);
-int	mac_check_cred_visible(struct ucred *u1, struct ucred *u2);
+int	mac_cred_check_visible(struct ucred *u1, struct ucred *u2);
 
-void	mac_init_ifnet(struct ifnet *);
-void	mac_destroy_ifnet(struct ifnet *);
-void	mac_create_ifnet(struct ifnet *ifp);
+void	mac_ifnet_init(struct ifnet *);
+void	mac_ifnet_destroy(struct ifnet *);
+void	mac_ifnet_create(struct ifnet *ifp);
 void	mac_create_mbuf_linklayer(struct ifnet *ifnet, struct mbuf *m);
-void	mac_create_mbuf_from_ifnet(struct ifnet *ifnet, struct mbuf *m);
+void	mac_ifnet_create_mbuf(struct ifnet *ifnet, struct mbuf *m);
 void	mac_create_mbuf_multicast_encap(struct mbuf *oldmbuf,
 	    struct ifnet *ifnet, struct mbuf *newmbuf);
-int	mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *m);
-int	mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr,
+int	mac_ifnet_check_transmit(struct ifnet *ifnet, struct mbuf *m);
+int	mac_ifnet_ioctl_get(struct ucred *cred, struct ifreq *ifr,
 	    struct ifnet *ifnet);
-int	mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr,
+int	mac_ifnet_ioctl_set(struct ucred *cred, struct ifreq *ifr,
 	    struct ifnet *ifnet);
 
-int	mac_init_inpcb(struct inpcb *, int flag);
-void	mac_destroy_inpcb(struct inpcb *);
-void	mac_create_inpcb_from_socket(struct socket *so, struct inpcb *inp);
-void	mac_create_mbuf_from_inpcb(struct inpcb *inp, struct mbuf *m);
+int	mac_inpcb_init(struct inpcb *, int flag);
+void	mac_inpcb_destroy_inpcb(struct inpcb *);
+void	mac_inpcb_create_from_socket(struct socket *so, struct inpcb *inp);
+void	mac_inpcb_create_mbuf(struct inpcb *inp, struct mbuf *m);
 void	mac_inpcb_sosetlabel(struct socket *so, struct inpcb *inp);
-int	mac_check_inpcb_deliver(struct inpcb *inp, struct mbuf *m);
+int	mac_inpcb_check_inpcb_deliver(struct inpcb *inp, struct mbuf *m);
 
-int	mac_init_ipq(struct ipq *, int flag);
-void	mac_destroy_ipq(struct ipq *);
-void	mac_create_ipq(struct mbuf *fragment, struct ipq *ipq);
-void	mac_create_datagram_from_ipq(struct ipq *ipq, struct mbuf *datagram);
-int	mac_fragment_match(struct mbuf *fragment, struct ipq *ipq);
-void	mac_update_ipq(struct mbuf *fragment, struct ipq *ipq);
+int	mac_ipq_init(struct ipq *, int flag);
+void	mac_ipq_destroy(struct ipq *);
+void	mac_ipq_create(struct mbuf *fragment, struct ipq *ipq);
+void	mac_ipq_create_datagram(struct ipq *ipq, struct mbuf *datagram);
+int	mac_ipq_fragment_match(struct mbuf *fragment, struct ipq *ipq);
+void	mac_ipq_update(struct mbuf *fragment, struct ipq *ipq);
 
-int	mac_check_kenv_dump(struct ucred *cred);
-int	mac_check_kenv_get(struct ucred *cred, char *name);
-int	mac_check_kenv_set(struct ucred *cred, char *name, char *value);
-int	mac_check_kenv_unset(struct ucred *cred, char *name);
+int	mac_kenv_check_dump(struct ucred *cred);
+int	mac_kenv_check_get(struct ucred *cred, char *name);
+int	mac_kenv_check_set(struct ucred *cred, char *name, char *value);
+int	mac_kenv_check_unset(struct ucred *cred, char *name);
 
-int	mac_check_kld_load(struct ucred *cred, struct vnode *vp);
-int	mac_check_kld_stat(struct ucred *cred);
-int	mac_check_kld_unload(struct ucred *cred);
+int	mac_kld_check_load(struct ucred *cred, struct vnode *vp);
+int	mac_kld_check_stat(struct ucred *cred);
+int	mac_kld_check_unload(struct ucred *cred);
 
-void	mac_init_posix_sem(struct ksem *);
-void	mac_destroy_posix_sem(struct ksem *);
-void 	mac_create_posix_sem(struct ucred *cred, struct ksem *ksemptr);
-int	mac_check_posix_sem_destroy(struct ucred *cred, struct ksem *ksemptr);
-int	mac_check_posix_sem_getvalue(struct ucred *cred,struct ksem *ksemptr);
-int	mac_check_posix_sem_open(struct ucred *cred, struct ksem *ksemptr);
-int	mac_check_posix_sem_post(struct ucred *cred, struct ksem *ksemptr);
-int	mac_check_posix_sem_unlink(struct ucred *cred, struct ksem *ksemptr);
-int	mac_check_posix_sem_wait(struct ucred *cred, struct ksem *ksemptr);
+void	mac_posix_sem_init(struct ksem *);
+void	mac_posix_sem_destroy_posix_sem(struct ksem *);
+void 	mac_posix_sem_create(struct ucred *cred, struct ksem *ksemptr);
+int	mac_posix_sem_check_destroy(struct ucred *cred, struct ksem *ksemptr);
+int	mac_posix_sem_check_getvalue(struct ucred *cred,struct ksem *ksemptr);
+int	mac_posix_sem_check_open(struct ucred *cred, struct ksem *ksemptr);
+int	mac_posix_sem_check_post(struct ucred *cred, struct ksem *ksemptr);
+int	mac_posix_sem_check_unlink(struct ucred *cred, struct ksem *ksemptr);
+int	mac_posix_sem_check_wait(struct ucred *cred, struct ksem *ksemptr);
 
-int	mac_init_mbuf(struct mbuf *mbuf, int flag);
-int	mac_init_mbuf_tag(struct m_tag *, int flag);
-void	mac_copy_mbuf(struct mbuf *m_from, struct mbuf *m_to);
-void	mac_copy_mbuf_tag(struct m_tag *, struct m_tag *);
-void	mac_destroy_mbuf_tag(struct m_tag *);
-void	mac_create_fragment(struct mbuf *datagram, struct mbuf *fragment);
-void	mac_create_mbuf_netlayer(struct mbuf *oldmbuf, struct mbuf *newmbuf);
-void	mac_reflect_mbuf_icmp(struct mbuf *m);
-void	mac_reflect_mbuf_tcp(struct mbuf *m);
+int	mac_mbuf_init(struct mbuf *mbuf, int flag);
+int	mac_mbuf_tag_init(struct m_tag *, int flag);
+void	mac_mbuf_copy(struct mbuf *m_from, struct mbuf *m_to);
+void	mac_mbuf_tag_copy(struct m_tag *, struct m_tag *);
+void	mac_mbuf_tag_destroy(struct m_tag *);
+void	mac_mbuf_create_fragment(struct mbuf *datagram, struct mbuf *fragment);
+void	mac_mbuf_create_netlayer(struct mbuf *oldmbuf, struct mbuf *newmbuf);
+void	mac_mbuf_reflect_icmp(struct mbuf *m);
+void	mac_mbuf_reflect_tcp(struct mbuf *m);
 
-void	mac_init_mount(struct mount *);
-void	mac_destroy_mount(struct mount *);
-void	mac_create_mount(struct ucred *cred, struct mount *mp);
-int	mac_check_mount_stat(struct ucred *cred, struct mount *mp);
+void	mac_mount_init(struct mount *);
+void	mac_mount_destroy(struct mount *);
+void	mac_mount_create(struct ucred *cred, struct mount *mp);
+int	mac_mount_check_stat(struct ucred *cred, struct mount *mp);
 
-void	mac_init_pipe(struct pipepair *);
-void	mac_destroy_pipe(struct pipepair *);
-void	mac_create_pipe(struct ucred *cred, struct pipepair *pp);
-int	mac_check_pipe_ioctl(struct ucred *cred, struct pipepair *pp,
+void	mac_pipe_init(struct pipepair *);
+void	mac_pipe_destroy(struct pipepair *);
+void	mac_pipe_create(struct ucred *cred, struct pipepair *pp);
+int	mac_pipe_check_ioctl(struct ucred *cred, struct pipepair *pp,
 	    unsigned long cmd, void *data);
-int	mac_check_pipe_poll(struct ucred *cred, struct pipepair *pp);
-int	mac_check_pipe_read(struct ucred *cred, struct pipepair *pp);
-int	mac_check_pipe_stat(struct ucred *cred, struct pipepair *pp);
-int	mac_check_pipe_write(struct ucred *cred, struct pipepair *pp);
+int	mac_pipe_check_poll(struct ucred *cred, struct pipepair *pp);
+int	mac_pipe_check_read(struct ucred *cred, struct pipepair *pp);
+int	mac_pipe_check_stat(struct ucred *cred, struct pipepair *pp);
+int	mac_pipe_check_write(struct ucred *cred, struct pipepair *pp);
 int	mac_pipe_label_set(struct ucred *cred, struct pipepair *pp,
 	    struct label *label);
 
-void	mac_init_proc(struct proc *);
-void	mac_destroy_proc(struct proc *);
-void	mac_create_proc0(struct ucred *cred);
-void	mac_create_proc1(struct ucred *cred);
+void	mac_proc_init(struct proc *);
+void	mac_proc_destroy(struct proc *);
+void	mac_proc_create_swapper(struct ucred *cred);
+void	mac_proc_create_init(struct ucred *cred);
 void	mac_thread_userret(struct thread *td);
-int	mac_check_proc_debug(struct ucred *cred, struct proc *proc);
-int	mac_check_proc_sched(struct ucred *cred, struct proc *proc);
-int	mac_check_proc_setuid(struct proc *proc,  struct ucred *cred,
+int	mac_proc_check_debug(struct ucred *cred, struct proc *proc);
+int	mac_proc_check_sched(struct ucred *cred, struct proc *proc);
+int	mac_proc_check_setuid(struct proc *proc,  struct ucred *cred,
 	    uid_t uid);
-int	mac_check_proc_seteuid(struct proc *proc, struct ucred *cred,
+int	mac_proc_check_seteuid(struct proc *proc, struct ucred *cred,
 	    uid_t euid);
-int	mac_check_proc_setgid(struct proc *proc, struct ucred *cred,
+int	mac_proc_check_setgid(struct proc *proc, struct ucred *cred,
 	    gid_t gid);
-int	mac_check_proc_setegid(struct proc *proc, struct ucred *cred,
+int	mac_proc_check_setegid(struct proc *proc, struct ucred *cred,
 	    gid_t egid);
-int	mac_check_proc_setgroups(struct proc *proc, struct ucred *cred,
+int	mac_proc_check_setgroups(struct proc *proc, struct ucred *cred,
 	    int ngroups, gid_t *gidset);
-int	mac_check_proc_setreuid(struct proc *proc, struct ucred *cred,
+int	mac_proc_check_setreuid(struct proc *proc, struct ucred *cred,
 	    uid_t ruid, uid_t euid);
-int	mac_check_proc_setregid(struct proc *proc, struct ucred *cred,
+int	mac_proc_check_setregid(struct proc *proc, struct ucred *cred,
 	    gid_t rgid, gid_t egid);
-int	mac_check_proc_setresuid(struct proc *proc, struct ucred *cred,
+int	mac_proc_check_setresuid(struct proc *proc, struct ucred *cred,
 	    uid_t ruid, uid_t euid, uid_t suid);
-int	mac_check_proc_setresgid(struct proc *proc, struct ucred *cred,
+int	mac_proc_check_setresgid(struct proc *proc, struct ucred *cred,
 	    gid_t rgid, gid_t egid, gid_t sgid);
-int	mac_check_proc_signal(struct ucred *cred, struct proc *proc,
+int	mac_proc_check_signal(struct ucred *cred, struct proc *proc,
 	    int signum);
-int	mac_check_proc_wait(struct ucred *cred, struct proc *proc);
+int	mac_proc_check_wait(struct ucred *cred, struct proc *proc);
 void	mac_associate_nfsd_label(struct ucred *cred);
 void	mac_cred_mmapped_drop_perms(struct thread *td, struct ucred *cred);
 
-int	mac_init_socket(struct socket *, int flag);
-void	mac_destroy_socket(struct socket *);
-void	mac_create_mbuf_from_socket(struct socket *so, struct mbuf *m);
-void	mac_create_socket(struct ucred *cred, struct socket *socket);
-void	mac_create_socket_from_socket(struct socket *oldsocket,
+int	mac_socket_init(struct socket *, int flag);
+void	mac_socket_destroy(struct socket *);
+void	mac_socket_create_mbuf(struct socket *so, struct mbuf *m);
+void	mac_socket_create(struct ucred *cred, struct socket *socket);
+void	mac_socket_accept(struct socket *oldsocket,
 	    struct socket *newsocket);
-void	mac_set_socket_peer_from_mbuf(struct mbuf *mbuf,
+void	mac_socket_set_peer_from_mbuf(struct mbuf *mbuf,
 	    struct socket *socket);
-void	mac_set_socket_peer_from_socket(struct socket *oldsocket,
+void	mac_socket_set_peer_from_socket(struct socket *oldsocket,
 	    struct socket *newsocket);
-int	mac_check_socket_accept(struct ucred *cred, struct socket *so);
-int	mac_check_socket_bind(struct ucred *cred, struct socket *so,
+int	mac_socket_check_accept(struct ucred *cred, struct socket *so);
+int	mac_socket_check_bind(struct ucred *cred, struct socket *so,
 	    struct sockaddr *sockaddr);
-int	mac_check_socket_connect(struct ucred *cred, struct socket *so,
+int	mac_socket_check_connect(struct ucred *cred, struct socket *so,
 	    struct sockaddr *sockaddr);
-int	mac_check_socket_create(struct ucred *cred, int domain, int type,
+int	mac_socket_check_create(struct ucred *cred, int domain, int type,
 	    int protocol);
-int	mac_check_socket_deliver(struct socket *so, struct mbuf *m);
-int	mac_check_socket_listen(struct ucred *cred, struct socket *so);
-int	mac_check_socket_poll(struct ucred *cred, struct socket *so);
-int	mac_check_socket_receive(struct ucred *cred, struct socket *so);
-int	mac_check_socket_send(struct ucred *cred, struct socket *so);
-int	mac_check_socket_stat(struct ucred *cred, struct socket *so);
-int	mac_check_socket_visible(struct ucred *cred, struct socket *so);
+int	mac_socket_check_deliver(struct socket *so, struct mbuf *m);
+int	mac_socket_check_listen(struct ucred *cred, struct socket *so);
+int	mac_socket_check_poll(struct ucred *cred, struct socket *so);
+int	mac_socket_check_receive(struct ucred *cred, struct socket *so);
+int	mac_socket_check_send(struct ucred *cred, struct socket *so);
+int	mac_socket_check_stat(struct ucred *cred, struct socket *so);
+int	mac_socket_check_visible(struct ucred *cred, struct socket *so);
 
-int	mac_check_sysarch_ioperm(struct ucred *cred);
-int	mac_check_system_acct(struct ucred *cred, struct vnode *vp);
-int	mac_check_system_nfsd(struct ucred *cred);
-int	mac_check_system_reboot(struct ucred *cred, int howto);
-int	mac_check_system_settime(struct ucred *cred);
-int	mac_check_system_swapon(struct ucred *cred, struct vnode *vp);
-int	mac_check_system_swapoff(struct ucred *cred, struct vnode *vp);
-int	mac_check_system_sysctl(struct ucred *cred, struct sysctl_oid *oidp,
+int	mac_system_check_sysarch_ioperm(struct ucred *cred);
+int	mac_system_check_acct(struct ucred *cred, struct vnode *vp);
+int	mac_system_check_nfsd(struct ucred *cred);
+int	mac_system_check_reboot(struct ucred *cred, int howto);
+int	mac_system_check_settime(struct ucred *cred);
+int	mac_system_check_swapon(struct ucred *cred, struct vnode *vp);
+int	mac_system_check_swapoff(struct ucred *cred, struct vnode *vp);
+int	mac_system_check_sysctl(struct ucred *cred, struct sysctl_oid *oidp,
 	    void *arg1, int arg2, struct sysctl_req *req);
+int	mac_socket_getsockopt_label(struct ucred *cred, struct socket *so,
+	    struct mac *extmac);
+int	mac_socket_getsockopt_peerlabel(struct ucred *cred, struct socket *so,
+	    struct mac *extmac);
+int	mac_socket_setsockopt_label(struct ucred *cred, struct socket *so,
+	    struct mac *extmac);
 
-int	mac_check_vnode_access(struct ucred *cred, struct vnode *vp,
-	    int acc_mode);
 void	mac_init_sysv_msgqueue(struct msqid_kernel*);
 void	mac_destroy_sysv_msgqueue(struct msqid_kernel *);
 void	mac_cleanup_sysv_msgmsg(struct msg *msgptr);
@@ -292,18 +296,18 @@
 int	mac_check_sysv_semop(struct ucred *cred,struct semid_kernel *semakptr,
 	    size_t accesstype);
 
-void	mac_init_sysv_shm(struct shmid_kernel*);
-void	mac_destroy_sysv_shm(struct shmid_kernel *);
-void	mac_create_sysv_shm(struct ucred *cred,
+void	mac_sysv_shm_init(struct shmid_kernel*);
+void	mac_sysv_shm_destroy(struct shmid_kernel *);
+void	mac_sysv_shm_create(struct ucred *cred,
 	    struct shmid_kernel *shmsegptr);
-void	mac_cleanup_sysv_shm(struct shmid_kernel *shmsegptr);
-int	mac_check_sysv_shmat(struct ucred *cred,
+void	mac_sysv_shm_cleanup(struct shmid_kernel *shmsegptr);
+int	mac_sysv_shm_check_shmat(struct ucred *cred,
 	    struct shmid_kernel *shmsegptr, int shmflg);
-int	mac_check_sysv_shmctl(struct ucred *cred,
+int	mac_sysv_shm_check_shmctl(struct ucred *cred,
 	    struct shmid_kernel *shmsegptr, int cmd);
-int	mac_check_sysv_shmdt(struct ucred *cred,
+int	mac_sysv_shm_check_shmdt(struct ucred *cred,
 	    struct shmid_kernel *shmsegptr);
-int	mac_check_sysv_shmget(struct ucred *cred,
+int	mac_sysv_shm_check_shmget(struct ucred *cred,
 	    struct shmid_kernel *shmsegptr, int shmflg);
 
 int	mac_execve_enter(struct image_params *imgp, struct mac *mac_p);
@@ -314,78 +318,74 @@
 int	mac_execve_will_transition(struct ucred *old, struct vnode *vp,
 	    struct label *interpvnodelabel, struct image_params *imgp);
 
-void	mac_init_vnode(struct vnode *);
-void	mac_copy_vnode_label(struct label *, struct label *label);
-void	mac_destroy_vnode(struct vnode *);
+void	mac_vnode_init(struct vnode *);
+void	mac_vnode_copy_label(struct label *, struct label *label);
+void	mac_vnode_destroy(struct vnode *);
 struct label	*mac_vnode_label_alloc(void);
 void		 mac_vnode_label_free(struct label *label);
-int	mac_associate_vnode_extattr(struct mount *mp, struct vnode *vp);
-void	mac_associate_vnode_singlelabel(struct mount *mp, struct vnode *vp);
-int	mac_create_vnode_extattr(struct ucred *cred, struct mount *mp,
+int	mac_vnode_associate_extattr(struct mount *mp, struct vnode *vp);
+void	mac_vnode_associate_singlelabel(struct mount *mp, struct vnode *vp);
+int	mac_vnode_create_extattr(struct ucred *cred, struct mount *mp,
 	    struct vnode *dvp, struct vnode *vp, struct componentname *cnp);
-void	mac_relabel_vnode(struct ucred *cred, struct vnode *vp,
+void	mac_vnode_relabel(struct ucred *cred, struct vnode *vp,
 	    struct label *newlabel);
-int	mac_check_vnode_chdir(struct ucred *cred, struct vnode *dvp);
-int	mac_check_vnode_chroot(struct ucred *cred, struct vnode *dvp);
-int	mac_check_vnode_create(struct ucred *cred, struct vnode *dvp,
+int	mac_vnode_check_access(struct ucred *cred, struct vnode *vp,
+	    int acc_mode);
+int	mac_vnode_check_chdir(struct ucred *cred, struct vnode *dvp);
+int	mac_vnode_check_chroot(struct ucred *cred, struct vnode *dvp);
+int	mac_vnode_check_create(struct ucred *cred, struct vnode *dvp,
 	    struct componentname *cnp, struct vattr *vap);
-int	mac_check_vnode_delete(struct ucred *cred, struct vnode *dvp,
+int	mac_vnode_check_delete(struct ucred *cred, struct vnode *dvp,
 	    struct vnode *vp, struct componentname *cnp);
-int	mac_check_vnode_deleteacl(struct ucred *cred, struct vnode *vp,
+int	mac_vnode_check_deleteacl(struct ucred *cred, struct vnode *vp,
 	    acl_type_t type);
-int	mac_check_vnode_deleteextattr(struct ucred *cred, struct vnode *vp,
+int	mac_vnode_check_deleteextattr(struct ucred *cred, struct vnode *vp,
 	    int attrnamespace, const char *name);
-int	mac_check_vnode_exec(struct ucred *cred, struct vnode *vp,
+int	mac_vnode_check_exec(struct ucred *cred, struct vnode *vp,
 	    struct image_params *imgp);
-int	mac_check_vnode_getacl(struct ucred *cred, struct vnode *vp,
+int	mac_vnode_check_getacl(struct ucred *cred, struct vnode *vp,
 	    acl_type_t type);
-int	mac_check_vnode_getextattr(struct ucred *cred, struct vnode *vp,
+int	mac_vnode_check_getextattr(struct ucred *cred, struct vnode *vp,
 	    int attrnamespace, const char *name, struct uio *uio);
-int	mac_check_vnode_link(struct ucred *cred, struct vnode *dvp,
+int	mac_vnode_check_link(struct ucred *cred, struct vnode *dvp,
 	    struct vnode *vp, struct componentname *cnp);
-int	mac_check_vnode_listextattr(struct ucred *cred, struct vnode *vp,
+int	mac_vnode_check_listextattr(struct ucred *cred, struct vnode *vp,
 	    int attrnamespace);
-int	mac_check_vnode_lookup(struct ucred *cred, struct vnode *dvp,
+int	mac_vnode_check_lookup(struct ucred *cred, struct vnode *dvp,
  	    struct componentname *cnp);
-int	mac_check_vnode_mmap(struct ucred *cred, struct vnode *vp,
+int	mac_vnode_check_mmap(struct ucred *cred, struct vnode *vp,
 	    int prot, int flags);
-int	mac_check_vnode_mprotect(struct ucred *cred, struct vnode *vp,
+int	mac_vnode_check_mprotect(struct ucred *cred, struct vnode *vp,
 	    int prot);
-int	mac_check_vnode_open(struct ucred *cred, struct vnode *vp,
+int	mac_vnode_check_open(struct ucred *cred, struct vnode *vp,
 	    int acc_mode);
-int	mac_check_vnode_poll(struct ucred *active_cred,
+int	mac_vnode_check_poll(struct ucred *active_cred,
 	    struct ucred *file_cred, struct vnode *vp);
-int	mac_check_vnode_read(struct ucred *active_cred,
+int	mac_vnode_check_read(struct ucred *active_cred,
 	    struct ucred *file_cred, struct vnode *vp);
-int	mac_check_vnode_readdir(struct ucred *cred, struct vnode *vp);
-int	mac_check_vnode_readlink(struct ucred *cred, struct vnode *vp);
-int	mac_check_vnode_rename_from(struct ucred *cred, struct vnode *dvp,
+int	mac_vnode_check_readdir(struct ucred *cred, struct vnode *vp);
+int	mac_vnode_check_readlink(struct ucred *cred, struct vnode *vp);
+int	mac_vnode_check_rename_from(struct ucred *cred, struct vnode *dvp,
 	    struct vnode *vp, struct componentname *cnp);
-int	mac_check_vnode_rename_to(struct ucred *cred, struct vnode *dvp,
+int	mac_vnode_check_rename_to(struct ucred *cred, struct vnode *dvp,
 	    struct vnode *vp, int samedir, struct componentname *cnp);
-int	mac_check_vnode_revoke(struct ucred *cred, struct vnode *vp);
-int	mac_check_vnode_setacl(struct ucred *cred, struct vnode *vp,
+int	mac_vnode_check_revoke(struct ucred *cred, struct vnode *vp);
+int	mac_vnode_check_setacl(struct ucred *cred, struct vnode *vp,
 	    acl_type_t type, struct acl *acl);
-int	mac_check_vnode_setextattr(struct ucred *cred, struct vnode *vp,
+int	mac_vnode_check_setextattr(struct ucred *cred, struct vnode *vp,
 	    int attrnamespace, const char *name, struct uio *uio);
-int	mac_check_vnode_setflags(struct ucred *cred, struct vnode *vp,
+int	mac_vnode_check_setflags(struct ucred *cred, struct vnode *vp,
 	    u_long flags);
-int	mac_check_vnode_setmode(struct ucred *cred, struct vnode *vp,
+int	mac_vnode_check_setmode(struct ucred *cred, struct vnode *vp,
 	    mode_t mode);
-int	mac_check_vnode_setowner(struct ucred *cred, struct vnode *vp,
+int	mac_vnode_check_setowner(struct ucred *cred, struct vnode *vp,
 	    uid_t uid, gid_t gid);
-int	mac_check_vnode_setutimes(struct ucred *cred, struct vnode *vp,
+int	mac_vnode_check_setutimes(struct ucred *cred, struct vnode *vp,
 	    struct timespec atime, struct timespec mtime);
-int	mac_check_vnode_stat(struct ucred *active_cred,
+int	mac_vnode_check_stat(struct ucred *active_cred,
 	    struct ucred *file_cred, struct vnode *vp);
-int	mac_check_vnode_write(struct ucred *active_cred,
+int	mac_vnode_check_write(struct ucred *active_cred,
 	    struct ucred *file_cred, struct vnode *vp);
-int	mac_getsockopt_label(struct ucred *cred, struct socket *so,
-	    struct mac *extmac);
-int	mac_getsockopt_peerlabel(struct ucred *cred, struct socket *so,
-	    struct mac *extmac);
-int	mac_setsockopt_label(struct ucred *cred, struct socket *so,
-	    struct mac *extmac);
 
 /*
  * Calls to help various file systems implement labeling functionality



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607061018.k66AIGiL061524>