PERFORCE change 126271 for review

[Robert Watson]

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

Change 126271 by rwatson at rwatson_zoo on 2007/09/10 15:38:28

	Update some additional files for mac2 changes.

Affected files ...

.. //depot/projects/trustedbsd/mac2/sys/kern/uipc_socket.c#8 edit
.. //depot/projects/trustedbsd/mac2/sys/netinet6/ip6_ipsec.c#3 edit
.. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_framework.c#2 edit
.. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_framework.h#2 edit
.. //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#15 delete

Differences ...

==== //depot/projects/trustedbsd/mac2/sys/kern/uipc_socket.c#8 (text+ko) ====

@@ -107,8 +107,6 @@
 #include <sys/fcntl.h>
 #include <sys/limits.h>
 #include <sys/lock.h>
-#include <sys/mac.h>
-#include <sys/mac_framework.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/mutex.h>

==== //depot/projects/trustedbsd/mac2/sys/netinet6/ip6_ipsec.c#3 (text+ko) ====

@@ -34,7 +34,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>

==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_framework.c#2 (text+ko) ====


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

@@ -90,44 +90,44 @@
 /*
  * Kernel functions to manage and evaluate labels.
  */
-void	mac_init_bpfdesc(struct bpf_d *);
-void	mac_init_cred(struct ucred *);
-void	mac_init_devfs(struct devfs_dirent *);
-void	mac_init_ifnet(struct ifnet *);
-int	mac_init_inpcb(struct inpcb *, int);
-void	mac_init_sysv_msgmsg(struct msg *);
-void	mac_init_sysv_msgqueue(struct msqid_kernel *);
-void	mac_init_sysv_sem(struct semid_kernel *);
-void	mac_init_sysv_shm(struct shmid_kernel *);
+void	mac_bpfdesc_init(struct bpf_d *);
+void	mac_cred_init(struct ucred *);
+void	mac_devfs_init(struct devfs_dirent *);
+void	mac_ifnet_init(struct ifnet *);
+int	mac_inpcb_init(struct inpcb *, int);
+void	mac_sysvmsg_init(struct msg *);
+void	mac_sysvmsq_init(struct msqid_kernel *);
+void	mac_sysvsem_init(struct semid_kernel *);
+void	mac_sysvshm_init(struct shmid_kernel *);
 int	mac_init_ipq(struct ipq *, int);
 int	mac_init_socket(struct socket *, int);
-void	mac_init_pipe(struct pipepair *);
-void	mac_init_posix_sem(struct ksem *);
-int	mac_init_mbuf(struct mbuf *, int);
-int	mac_init_mbuf_tag(struct m_tag *, int);
-void	mac_init_mount(struct mount *);
-void	mac_init_proc(struct proc *);
-void	mac_init_vnode(struct vnode *);
+void	mac_pipe_init(struct pipepair *);
+void	mac_posix_sem_init(struct ksem *);
+int	mac_mbuf_init(struct mbuf *, int);
+int	mac_mbuf_tag_init(struct m_tag *, int);
+void	mac_mount_init(struct mount *);
+void	mac_proc_init(struct proc *);
+void	mac_vnode_init(struct vnode *);
 void	mac_copy_mbuf(struct mbuf *, struct mbuf *);
 void	mac_copy_mbuf_tag(struct m_tag *, struct m_tag *);
 void	mac_copy_vnode_label(struct label *, struct label *);
-void	mac_destroy_bpfdesc(struct bpf_d *);
-void	mac_destroy_cred(struct ucred *);
-void	mac_destroy_devfs(struct devfs_dirent *);
-void	mac_destroy_ifnet(struct ifnet *);
-void	mac_destroy_inpcb(struct inpcb *);
-void	mac_destroy_sysv_msgmsg(struct msg *);
-void	mac_destroy_sysv_msgqueue(struct msqid_kernel *);
-void	mac_destroy_sysv_sem(struct semid_kernel *);
-void	mac_destroy_sysv_shm(struct shmid_kernel *);
+void	mac_bpfdesc_destroy(struct bpf_d *);
+void	mac_cred_destroy(struct ucred *);
+void	mac_devfs_destroy(struct devfs_dirent *);
+void	mac_ifnet_destroy(struct ifnet *);
+void	mac_inpcb_destroy(struct inpcb *);
+void	mac_sysvmsg_destroy(struct msg *);
+void	mac_sysvmsq_destroy(struct msqid_kernel *);
+void	mac_sysvsem_destroy(struct semid_kernel *);
+void	mac_sysvshm_destroy(struct shmid_kernel *);
 void	mac_destroy_ipq(struct ipq *);
 void	mac_destroy_socket(struct socket *);
-void	mac_destroy_pipe(struct pipepair *);
-void	mac_destroy_posix_sem(struct ksem *);
-void	mac_destroy_proc(struct proc *);
-void	mac_destroy_mbuf_tag(struct m_tag *);
-void	mac_destroy_mount(struct mount *);
-void	mac_destroy_vnode(struct vnode *);
+void	mac_pipe_destroy(struct pipepair *);
+void	mac_posix_sem_destroy(struct ksem *);
+void	mac_proc_destroy(struct proc *);
+void	mac_mbuf_tag_destroy(struct m_tag *);
+void	mac_mount_destroy(struct mount *);
+void	mac_vnode_destroy(struct vnode *);
 
 struct label	*mac_cred_label_alloc(void);
 void		 mac_cred_label_free(struct label *);
@@ -138,15 +138,15 @@
  * Labeling event operations: file system objects, and things that look a lot
  * like file system objects.
  */
-void	mac_associate_vnode_devfs(struct mount *mp, struct devfs_dirent *de,
+void	mac_vnode_associate_devfs(struct mount *mp, struct devfs_dirent *de,
 	    struct vnode *vp);
-int	mac_associate_vnode_extattr(struct mount *mp, struct vnode *vp);
-void	mac_associate_vnode_singlelabel(struct mount *mp, struct vnode *vp);
-void	mac_create_devfs_device(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);
+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);
 int	mac_create_vnode_extattr(struct ucred *cred, struct mount *mp,
 	    struct vnode *dvp, struct vnode *vp, struct componentname *cnp);