PERFORCE change 79659 for review

[Robert Watson]

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

Change 79659 by rwatson at rwatson_zoo on 2005/07/06 15:41:16

	Alphabetize, line wrap.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/sys/mac_policy.h#16 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/sys/sys/mac_policy.h#16 (text+ko) ====

@@ -59,6 +59,7 @@
 struct bpf_d;
 struct componentname;
 struct devfs_dirent;
+struct file;
 struct ifnet;
 struct image_params;
 struct inpcb;
@@ -154,18 +155,20 @@
 		    struct label *dest);
 	void	(*mpo_copy_mbuf_label)(struct label *src,
 		    struct label *dest);
+	void	(*mpo_copy_mount_label)(struct label *src,
+		    struct label *dest);
 	void	(*mpo_copy_pipe_label)(struct label *src,
 		    struct label *dest);
 	void	(*mpo_copy_socket_label)(struct label *src,
 		    struct label *dest);
 	void	(*mpo_copy_vnode_label)(struct label *src,
 		    struct label *dest);
-	void	(*mpo_copy_mount_label)(struct label *src,
-		    struct label *dest);
 	int	(*mpo_externalize_cred_label)(struct label *label,
 		    char *element_name, struct sbuf *sb, int *claimed);
 	int	(*mpo_externalize_ifnet_label)(struct label *label,
 		    char *element_name, struct sbuf *sb, int *claimed);
+	int	(*mpo_externalize_mount_label)(struct label *label,
+		    char *element_name, struct sbuf *sb, int *claimed);
 	int	(*mpo_externalize_pipe_label)(struct label *label,
 		    char *element_name, struct sbuf *sb, int *claimed);
 	int	(*mpo_externalize_socket_label)(struct label *label,
@@ -174,20 +177,18 @@
 		    char *element_name, struct sbuf *sb, int *claimed);
 	int	(*mpo_externalize_vnode_label)(struct label *label,
 		    char *element_name, struct sbuf *sb, int *claimed);
-	int	(*mpo_externalize_mount_label)(struct label *label,
-		    char *element_name, struct sbuf *sb, int *claimed);
 	int	(*mpo_internalize_cred_label)(struct label *label,
 		    char *element_name, char *element_data, int *claimed);
 	int	(*mpo_internalize_ifnet_label)(struct label *label,
 		    char *element_name, char *element_data, int *claimed);
+	int	(*mpo_internalize_mount_label)(struct label *label,
+		    char *element_name, char *element_data, int *claimed);
 	int	(*mpo_internalize_pipe_label)(struct label *label,
 		    char *element_name, char *element_data, int *claimed);
 	int	(*mpo_internalize_socket_label)(struct label *label,
 		    char *element_name, char *element_data, int *claimed);
 	int	(*mpo_internalize_vnode_label)(struct label *label,
 		    char *element_name, char *element_data, int *claimed);
-	int	(*mpo_internalize_mount_label)(struct label *label,
-		    char *element_name, char *element_data, int *claimed);
 
 	/*
 	 * Labeling event operations: file system objects, and things that
@@ -223,7 +224,8 @@
 		    struct vnode *vp, struct label *vlabel,
 		    struct componentname *cnp);
 	void	(*mpo_create_mount)(struct ucred *cred, struct mount *mp,
-		    struct label *mntlabel, struct label *fslabel, struct label *mount_arg_label);
+		    struct label *mntlabel, struct label *fslabel,
+		    struct label *mount_arg_label);
 	void	(*mpo_create_root_mount)(struct ucred *cred, struct mount *mp,
 		    struct label *mountlabel, struct label *fslabel);
 	void	(*mpo_relabel_vnode)(struct ucred *cred, struct vnode *vp,
@@ -440,10 +442,12 @@
 	int	(*mpo_check_kld_stat)(struct ucred *cred);
 	int	(*mpo_check_kld_unload)(struct ucred *cred);
 	int	(*mpo_check_mount)(struct ucred *cred, struct vnode *dir, 
-		    struct label *dirlabel, const char *vfc_name, struct label *mount_arg_label);
-	int	(*mpo_check_remount)(struct ucred *cred, struct mount *mp, struct label *ml,
-	            struct label *mount_arg_label);
-	int	(*mpo_check_umount)(struct ucred *cred, struct mount *mp, struct label *ml);
+		    struct label *dirlabel, const char *vfc_name,
+		    struct label *mount_arg_label);
+	int	(*mpo_check_remount)(struct ucred *cred, struct mount *mp,
+		    struct label *ml, struct label *mount_arg_label);
+	int	(*mpo_check_umount)(struct ucred *cred, struct mount *mp,
+		    struct label *ml);
 	int	(*mpo_check_mount_stat)(struct ucred *cred, struct mount *mp,
 		    struct label *mntlabel);
 	int	(*mpo_check_pipe_ioctl)(struct ucred *cred,
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message