PERFORCE change 15086 for review
Robert Watson
rwatson at freebsd.org
Mon Jul 29 02:02:59 GMT 2002
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15086
Change 15086 by rwatson at rwatson_paprika on 2002/07/28 19:01:59
Cosmetic whitespace changes.
Affected files ...
.. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#99 edit
Differences ...
==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#99 (text+ko) ====
@@ -72,8 +72,7 @@
struct label *label);
void (*mpo_init_ifnet)(struct ifnet *, struct label *label);
void (*mpo_init_ipq)(struct ipq *ipq, struct label *label);
- int (*mpo_init_mbuf)(struct mbuf *, int how,
- struct label *label);
+ int (*mpo_init_mbuf)(struct mbuf *, int how, struct label *label);
void (*mpo_init_mount)(struct mount *, struct label *mntlabel,
struct label *fslabel);
void (*mpo_init_socket)(struct socket *so, struct label *label,
@@ -81,25 +80,22 @@
void (*mpo_init_pipe)(struct pipe *pipe, struct label *label);
void (*mpo_init_temp)(struct label *label);
void (*mpo_init_vnode)(struct vnode *, struct label *label);
- void (*mpo_destroy_bpfdesc)(struct bpf_d *,
- struct label *label);
+ void (*mpo_destroy_bpfdesc)(struct bpf_d *, struct label *label);
void (*mpo_destroy_cred)(struct ucred *, struct label *label);
void (*mpo_destroy_devfsdirent)(struct devfs_dirent *de,
struct label *label);
void (*mpo_destroy_ifnet)(struct ifnet *, struct label *label);
void (*mpo_destroy_ipq)(struct ipq *ipq, struct label *label);
void (*mpo_destroy_mbuf)(struct mbuf *, struct label *label);
- void (*mpo_destroy_mount)(struct mount *,
- struct label *mntlabel, struct label *fslabel);
+ void (*mpo_destroy_mount)(struct mount *, struct label *mntlabel,
+ struct label *fslabel);
void (*mpo_destroy_socket)(struct socket *so, struct label *label,
struct label *peerlabel);
void (*mpo_destroy_pipe)(struct pipe *pipe, struct label *label);
void (*mpo_destroy_temp)(struct label *label);
void (*mpo_destroy_vnode)(struct vnode *, struct label *label);
- int (*mpo_externalize)(struct label *label,
- struct mac *extmac);
- int (*mpo_internalize)(struct label *label,
- struct mac *extmac);
+ int (*mpo_externalize)(struct label *label, struct mac *extmac);
+ int (*mpo_internalize)(struct label *label, struct mac *extmac);
/*
* Labeling event operations: file system objects, and things that
@@ -117,9 +113,8 @@
struct vnode *child, struct label *childlabel);
void (*mpo_create_mount)(struct ucred *cred, struct mount *mp,
struct label *mntlabel, struct label *fslabel);
- void (*mpo_create_root_mount)(struct ucred *cred,
- struct mount *mp, struct label *mountlabel,
- struct label *fslabel);
+ 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,
struct label *vnodelabel, struct label *label);
int (*mpo_stdcreatevnode_ea)(struct vnode *vp,
@@ -145,19 +140,17 @@
void (*mpo_create_mbuf_from_socket)(struct socket *so,
struct label *socketlabel, struct mbuf *m,
struct label *mbuflabel);
- void (*mpo_create_socket)(struct ucred *cred,
- struct socket *so, struct label *socketlabel);
+ void (*mpo_create_socket)(struct ucred *cred, struct socket *so,
+ struct label *socketlabel);
void (*mpo_create_socket_from_socket)(struct socket *oldsocket,
struct label *oldsocketlabel, struct socket *newsocket,
struct label *newsocketlabel);
- void (*mpo_relabel_socket)(struct ucred *cred,
- struct socket *socket, struct label *oldlabel,
- struct label *newlabel);
- void (*mpo_relabel_pipe)(struct ucred *cred,
- struct pipe *pipe, struct label *oldlabel,
- struct label *newlabel);
+ void (*mpo_relabel_socket)(struct ucred *cred, struct socket *so,
+ struct label *oldlabel, struct label *newlabel);
+ void (*mpo_relabel_pipe)(struct ucred *cred, struct pipe *pipe,
+ struct label *oldlabel, struct label *newlabel);
void (*mpo_set_socket_peer_from_mbuf)(struct mbuf *mbuf,
- struct label *mbuflabel, struct socket *socket,
+ struct label *mbuflabel, struct socket *so,
struct label *socketpeerlabel);
void (*mpo_set_socket_peer_from_socket)(struct socket *oldsocket,
struct label *oldsocketlabel, struct socket *newsocket,
@@ -214,9 +207,8 @@
*/
void (*mpo_create_cred)(struct ucred *parent_cred,
struct ucred *child_cred);
- void (*mpo_execve_transition)(struct ucred *old,
- struct ucred *new, struct vnode *vp,
- struct label *vnodelabel);
+ void (*mpo_execve_transition)(struct ucred *old, struct ucred *new,
+ struct vnode *vp, struct label *vnodelabel);
int (*mpo_execve_will_transition)(struct ucred *old,
struct vnode *vp, struct label *vnodelabel);
void (*mpo_create_proc0)(struct ucred *cred);
@@ -241,18 +233,19 @@
struct label *mbuflabel);
int (*mpo_check_mount_stat)(struct ucred *cred, struct mount *mp,
struct label *mntlabel);
- int (*mpo_check_pipe_ioctl)(struct ucred *cred,
- struct pipe *pipe, struct label *pipelabel,
- unsigned long cmd, void *data);
- int (*mpo_check_pipe_op)(struct ucred *cred,
- struct pipe *pipe, struct label *pipelabel, int op);
+ int (*mpo_check_pipe_ioctl)(struct ucred *cred, struct pipe *pipe,
+ struct label *pipelabel, unsigned long cmd, void *data);
+ int (*mpo_check_pipe_op)(struct ucred *cred, struct pipe *pipe,
+ struct label *pipelabel, int op);
int (*mpo_check_pipe_relabel)(struct ucred *cred,
struct pipe *pipe, struct label *pipelabel,
struct label *newlabel);
- int (*mpo_check_proc_debug)(struct ucred *cred, struct proc *proc);
- int (*mpo_check_proc_sched)(struct ucred *cred, struct proc *proc);
- int (*mpo_check_proc_signal)(struct ucred *cred, struct proc *proc,
- int signum);
+ int (*mpo_check_proc_debug)(struct ucred *cred,
+ struct proc *proc);
+ int (*mpo_check_proc_sched)(struct ucred *cred,
+ struct proc *proc);
+ int (*mpo_check_proc_signal)(struct ucred *cred,
+ struct proc *proc, int signum);
int (*mpo_check_socket_bind)(struct ucred *cred,
struct socket *so, struct label *socketlabel,
struct sockaddr *sockaddr);
@@ -268,7 +261,7 @@
struct socket *so, struct label *socketlabel,
struct label *newlabel);
int (*mpo_check_socket_visible)(struct ucred *cred,
- struct socket *socket, struct label *socketlabel);
+ struct socket *so, struct label *socketlabel);
int (*mpo_check_vnode_access)(struct ucred *cred,
struct vnode *vp, struct label *label, int flags);
int (*mpo_check_vnode_chdir)(struct ucred *cred,
@@ -283,19 +276,18 @@
struct vnode *vp, void *label, struct componentname *cnp);
int (*mpo_check_vnode_deleteacl)(struct ucred *cred,
struct vnode *vp, struct label *label, acl_type_t type);
- int (*mpo_check_vnode_exec)(struct ucred *cred,
- struct vnode *vp, struct label *label);
+ int (*mpo_check_vnode_exec)(struct ucred *cred, struct vnode *vp,
+ struct label *label);
int (*mpo_check_vnode_getacl)(struct ucred *cred,
struct vnode *vp, struct label *label, acl_type_t type);
int (*mpo_check_vnode_getextattr)(struct ucred *cred,
- struct vnode *vp, struct label *label,
- int attrnamespace, const char *name, struct uio *uio);
+ struct vnode *vp, struct label *label, int attrnamespace,
+ const char *name, struct uio *uio);
int (*mpo_check_vnode_lookup)(struct ucred *cred,
struct vnode *dvp, struct label *dlabel,
struct componentname *cnp);
- int (*mpo_check_vnode_open)(struct ucred *cred,
- struct vnode *vp, struct label *label,
- mode_t acc_mode);
+ int (*mpo_check_vnode_open)(struct ucred *cred, struct vnode *vp,
+ struct label *label, mode_t acc_mode);
int (*mpo_check_vnode_readdir)(struct ucred *cred,
struct vnode *dvp, struct label *dlabel);
int (*mpo_check_vnode_readlink)(struct ucred *cred,
@@ -304,12 +296,11 @@
struct vnode *vp, struct label *vnodelabel,
struct label *newlabel);
int (*mpo_check_vnode_rename_from)(struct ucred *cred,
- struct vnode *dvp, struct label *dlabel,
- struct vnode *vp, struct label *label,
- struct componentname *cnp);
+ struct vnode *dvp, struct label *dlabel, struct vnode *vp,
+ struct label *label, struct componentname *cnp);
int (*mpo_check_vnode_rename_to)(struct ucred *cred,
- struct vnode *dvp, struct label *dlabel,
- struct vnode *vp, struct label *label, int samedir,
+ struct vnode *dvp, struct label *dlabel, struct vnode *vp,
+ struct label *label, int samedir,
struct componentname *cnp);
int (*mpo_check_vnode_revoke)(struct ucred *cred,
struct vnode *vp, struct label *label);
@@ -317,8 +308,8 @@
struct vnode *vp, struct label *label, acl_type_t type,
struct acl *acl);
int (*mpo_check_vnode_setextattr)(struct ucred *cred,
- struct vnode *vp, struct label *label,
- int attrnamespace, const char *name, struct uio *uio);
+ struct vnode *vp, struct label *label, int attrnamespace,
+ const char *name, struct uio *uio);
int (*mpo_check_vnode_setflags)(struct ucred *cred,
struct vnode *vp, struct label *label, u_long flags);
int (*mpo_check_vnode_setmode)(struct ucred *cred,
@@ -329,12 +320,12 @@
int (*mpo_check_vnode_setutimes)(struct ucred *cred,
struct vnode *vp, struct label *label,
struct timespec atime, struct timespec mtime);
- int (*mpo_check_vnode_stat)(struct ucred *cred,
- struct vnode *vp, struct label *label);
+ int (*mpo_check_vnode_stat)(struct ucred *cred, struct vnode *vp,
+ struct label *label);
vm_prot_t (*mpo_check_vnode_mmap_perms)(struct ucred *cred,
struct vnode *vp, struct label *label, int newmapping);
- int (*mpo_check_vnode_op)(struct ucred *cred,
- struct vnode *vp, struct label *label, int op);
+ int (*mpo_check_vnode_op)(struct ucred *cred, struct vnode *vp,
+ struct label *label, int op);
};
typedef void *macop_t;
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message
More information about the trustedbsd-cvs
mailing list