38c38
< * $FreeBSD: head/sys/security/mac/mac_framework.h 168951 2007-04-22 15:31:22Z rwatson $
---
> * $FreeBSD: head/sys/security/mac/mac_framework.h 168955 2007-04-22 19:55:56Z rwatson $
96c96
< int mac_init_inpcb(struct inpcb *, int flag);
---
> int mac_init_inpcb(struct inpcb *, int);
98,102c98,102
< void mac_init_sysv_msgqueue(struct msqid_kernel*);
< void mac_init_sysv_sem(struct semid_kernel*);
< void mac_init_sysv_shm(struct shmid_kernel*);
< int mac_init_ipq(struct ipq *, int flag);
< int mac_init_socket(struct socket *, int flag);
---
> void mac_init_sysv_msgqueue(struct msqid_kernel *);
> void mac_init_sysv_sem(struct semid_kernel *);
> void mac_init_sysv_shm(struct shmid_kernel *);
> int mac_init_ipq(struct ipq *, int);
> int mac_init_socket(struct socket *, int);
105,106c105,106
< int mac_init_mbuf(struct mbuf *mbuf, int flag);
< int mac_init_mbuf_tag(struct m_tag *, int flag);
---
> int mac_init_mbuf(struct mbuf *, int);
> int mac_init_mbuf_tag(struct m_tag *, int);
110c110
< void mac_copy_mbuf(struct mbuf *m_from, struct mbuf *m_to);
---
> void mac_copy_mbuf(struct mbuf *, struct mbuf *);
112c112
< void mac_copy_vnode_label(struct label *, struct label *label);
---
> void mac_copy_vnode_label(struct label *, struct label *);
132c132
< void mac_cred_label_free(struct label *label);
---
> void mac_cred_label_free(struct label *);
134c134
< void mac_vnode_label_free(struct label *label);
---
> void mac_vnode_label_free(struct label *);
162,168c162,167
< void mac_create_socket(struct ucred *cred, struct socket *socket);
< void mac_create_socket_from_socket(struct socket *oldsocket,
< struct socket *newsocket);
< void mac_set_socket_peer_from_mbuf(struct mbuf *mbuf,
< struct socket *socket);
< void mac_set_socket_peer_from_socket(struct socket *oldsocket,
< struct socket *newsocket);
---
> void mac_create_socket(struct ucred *cred, struct socket *so);
> void mac_create_socket_from_socket(struct socket *oldso,
> struct socket *newso);
> void mac_set_socket_peer_from_mbuf(struct mbuf *m, struct socket *so);
> void mac_set_socket_peer_from_socket(struct socket *oldso,
> struct socket *newso);
191c190
< void mac_create_bpfdesc(struct ucred *cred, struct bpf_d *bpf_d);
---
> void mac_create_bpfdesc(struct ucred *cred, struct bpf_d *d);
194,196c193,195
< void mac_create_ipq(struct mbuf *fragment, struct ipq *ipq);
< void mac_create_datagram_from_ipq(struct ipq *ipq, struct mbuf *datagram);
< void mac_create_fragment(struct mbuf *datagram, struct mbuf *fragment);
---
> void mac_create_ipq(struct mbuf *m, struct ipq *ipq);
> void mac_create_datagram_from_ipq(struct ipq *ipq, struct mbuf *m);
> void mac_create_fragment(struct mbuf *m, struct mbuf *frag);
198,204c197,203
< void mac_create_mbuf_linklayer(struct ifnet *ifnet, struct mbuf *m);
< void mac_create_mbuf_from_bpfdesc(struct bpf_d *bpf_d, struct mbuf *m);
< void mac_create_mbuf_from_ifnet(struct ifnet *ifnet, struct mbuf *m);
< void mac_create_mbuf_multicast_encap(struct mbuf *oldmbuf,
< struct ifnet *ifnet, struct mbuf *newmbuf);
< void mac_create_mbuf_netlayer(struct mbuf *oldmbuf, struct mbuf *newmbuf);
< int mac_fragment_match(struct mbuf *fragment, struct ipq *ipq);
---
> void mac_create_mbuf_linklayer(struct ifnet *ifp, struct mbuf *m);
> void mac_create_mbuf_from_bpfdesc(struct bpf_d *d, struct mbuf *m);
> void mac_create_mbuf_from_ifnet(struct ifnet *ifp, struct mbuf *m);
> void mac_create_mbuf_multicast_encap(struct mbuf *m, struct ifnet *ifp,
> struct mbuf *mnew);
> void mac_create_mbuf_netlayer(struct mbuf *m, struct mbuf *mnew);
> int mac_fragment_match(struct mbuf *m, struct ipq *ipq);
207c206
< void mac_update_ipq(struct mbuf *fragment, struct ipq *ipq);
---
> void mac_update_ipq(struct mbuf *m, struct ipq *ipq);
210,213c209,212
< void mac_destroy_syncache(struct label **label);
< int mac_init_syncache(struct label **label);
< void mac_init_syncache_from_inpcb(struct label *label, struct inpcb *inp);
< void mac_create_mbuf_from_syncache(struct label *sc_label, struct mbuf *m);
---
> void mac_destroy_syncache(struct label **l);
> int mac_init_syncache(struct label **l);
> void mac_init_syncache_from_inpcb(struct label *l, struct inpcb *inp);
> void mac_create_mbuf_from_syncache(struct label *l, struct mbuf *m);
221c220
< void mac_execve_transition(struct ucred *old, struct ucred *new,
---
> void mac_execve_transition(struct ucred *oldcred, struct ucred *newcred,
224c223
< int mac_execve_will_transition(struct ucred *old, struct vnode *vp,
---
> int mac_execve_will_transition(struct ucred *cred, struct vnode *vp,
249,251c248,250
< int mac_check_bpfdesc_receive(struct bpf_d *bpf_d, struct ifnet *ifnet);
< int mac_check_cred_visible(struct ucred *u1, struct ucred *u2);
< int mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *m);
---
> int mac_check_bpfdesc_receive(struct bpf_d *d, struct ifnet *ifp);
> int mac_check_cred_visible(struct ucred *cr1, struct ucred *cr2);
> int mac_check_ifnet_transmit(struct ifnet *ifp, struct mbuf *m);
298,299c297,298
< 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_debug(struct ucred *cred, struct proc *p);
> int mac_check_proc_sched(struct ucred *cred, struct proc *p);
302c301
< int mac_check_proc_setuid(struct proc *proc, struct ucred *cred,
---
> int mac_check_proc_setuid(struct proc *p, struct ucred *cred,
304c303
< int mac_check_proc_seteuid(struct proc *proc, struct ucred *cred,
---
> int mac_check_proc_seteuid(struct proc *p, struct ucred *cred,
306c305
< int mac_check_proc_setgid(struct proc *proc, struct ucred *cred,
---
> int mac_check_proc_setgid(struct proc *p, struct ucred *cred,
308c307
< int mac_check_proc_setegid(struct proc *proc, struct ucred *cred,
---
> int mac_check_proc_setegid(struct proc *p, struct ucred *cred,
310c309
< int mac_check_proc_setgroups(struct proc *proc, struct ucred *cred,
---
> int mac_check_proc_setgroups(struct proc *p, struct ucred *cred,
312c311
< int mac_check_proc_setreuid(struct proc *proc, struct ucred *cred,
---
> int mac_check_proc_setreuid(struct proc *p, struct ucred *cred,
314c313
< int mac_check_proc_setregid(struct proc *proc, struct ucred *cred,
---
> int mac_check_proc_setregid(struct proc *p, struct ucred *cred,
316c315
< int mac_check_proc_setresuid(struct proc *proc, struct ucred *cred,
---
> int mac_check_proc_setresuid(struct proc *p, struct ucred *cred,
318c317
< int mac_check_proc_setresgid(struct proc *proc, struct ucred *cred,
---
> int mac_check_proc_setresgid(struct proc *p, struct ucred *cred,
320c319
< int mac_check_proc_signal(struct ucred *cred, struct proc *proc,
---
> int mac_check_proc_signal(struct ucred *cred, struct proc *p,
322c321
< int mac_check_proc_wait(struct ucred *cred, struct proc *proc);
---
> int mac_check_proc_wait(struct ucred *cred, struct proc *p);
325c324
< struct sockaddr *sockaddr);
---
> struct sockaddr *sa);
327c326
< struct sockaddr *sockaddr);
---
> struct sockaddr *sa);
329c328
< int protocol);
---
> int proto);
370,371c369,370
< int mac_check_vnode_mmap(struct ucred *cred, struct vnode *vp,
< int prot, int flags);
---
> int mac_check_vnode_mmap(struct ucred *cred, struct vnode *vp, int prot,
> int flags);
408c407
< struct ifnet *ifnet);
---
> struct ifnet *ifp);
410c409
< struct ifnet *ifnet);
---
> struct ifnet *ifp);