From owner-p4-projects@FreeBSD.ORG Wed Jul 6 15:42:04 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5950816A420; Wed, 6 Jul 2005 15:42:04 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 015F816A41C for ; Wed, 6 Jul 2005 15:42:04 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C731C43D45 for ; Wed, 6 Jul 2005 15:42: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.13.1/8.13.1) with ESMTP id j66Fg31T018410 for ; Wed, 6 Jul 2005 15:42:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j66Fg3Hu018407 for perforce@freebsd.org; Wed, 6 Jul 2005 15:42:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 6 Jul 2005 15:42:03 GMT Message-Id: <200507061542.j66Fg3Hu018407@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 Cc: Subject: PERFORCE change 79659 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jul 2005 15:42:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=79659 Change 79659 by rwatson@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,