38c38
< * $FreeBSD: head/sys/security/mac/mac_policy.h 168954 2007-04-22 16:18:10Z rwatson $
---
> * $FreeBSD: head/sys/security/mac/mac_policy.h 168955 2007-04-22 19:55:56Z rwatson $
199c199
< struct label *mntlabel, struct devfs_dirent *de,
---
> struct label *mplabel, struct devfs_dirent *de,
201c201
< struct label *vlabel);
---
> struct label *vplabel);
203,204c203,204
< struct label *mntlabel, struct vnode *vp,
< struct label *vlabel);
---
> struct label *mplabel, struct vnode *vp,
> struct label *vplabel);
206,207c206,207
< struct label *mntlabel, struct vnode *vp,
< struct label *vlabel);
---
> struct label *mplabel, struct vnode *vp,
> struct label *vplabel);
210c210
< struct devfs_dirent *de, struct label *label);
---
> struct devfs_dirent *de, struct label *delabel);
213c213
< struct label *label);
---
> struct label *delabel);
219,221c219,221
< struct mount *mp, struct label *mntlabel,
< struct vnode *dvp, struct label *dlabel,
< struct vnode *vp, struct label *vlabel,
---
> struct mount *mp, struct label *mplabel,
> struct vnode *dvp, struct label *dvplabel,
> struct vnode *vp, struct label *vplabel,
224c224
< struct label *mntlabel);
---
> struct label *mplabel);
226c226
< struct label *vnodelabel, struct label *label);
---
> struct label *vplabel, struct label *label);
228c228
< struct vnode *vp, struct label *vlabel,
---
> struct vnode *vp, struct label *vplabel,
231,233c231,232
< struct devfs_dirent *devfs_dirent,
< struct label *direntlabel, struct vnode *vp,
< struct label *vnodelabel);
---
> struct devfs_dirent *de, struct label *delabel,
> struct vnode *vp, struct label *vplabel);
239,240c238,239
< struct label *socketlabel, struct mbuf *m,
< struct label *mbuflabel);
---
> struct label *solabel, struct mbuf *m,
> struct label *mlabel);
242,245c241,244
< struct label *socketlabel);
< typedef void (*mpo_create_socket_from_socket_t)(struct socket *oldsocket,
< struct label *oldsocketlabel, struct socket *newsocket,
< struct label *newsocketlabel);
---
> struct label *solabel);
> typedef void (*mpo_create_socket_from_socket_t)(struct socket *oldso,
> struct label *oldsolabel, struct socket *newso,
> struct label *newsolabel);
250,255c249,254
< typedef void (*mpo_set_socket_peer_from_mbuf_t)(struct mbuf *mbuf,
< struct label *mbuflabel, struct socket *so,
< struct label *socketpeerlabel);
< typedef void (*mpo_set_socket_peer_from_socket_t)(struct socket *oldsocket,
< struct label *oldsocketlabel, struct socket *newsocket,
< struct label *newsocketpeerlabel);
---
> typedef void (*mpo_set_socket_peer_from_mbuf_t)(struct mbuf *m,
> struct label *mlabel, struct socket *so,
> struct label *sopeerlabel);
> typedef void (*mpo_set_socket_peer_from_socket_t)(struct socket *oldso,
> struct label *oldsolabel, struct socket *newso,
> struct label *newsopeerlabel);
257c256
< struct label *pipelabel);
---
> struct label *pplabel);
282,284c281,283
< struct bpf_d *bpf_d, struct label *bpflabel);
< typedef void (*mpo_create_ifnet_t)(struct ifnet *ifnet,
< struct label *ifnetlabel);
---
> struct bpf_d *d, struct label *dlabel);
> typedef void (*mpo_create_ifnet_t)(struct ifnet *ifp,
> struct label *ifplabel);
288,290c287,288
< typedef void (*mpo_create_ipq_t)(struct mbuf *fragment,
< struct label *fragmentlabel, struct ipq *ipq,
< struct label *ipqlabel);
---
> typedef void (*mpo_create_ipq_t)(struct mbuf *m, struct label *mlabel,
> struct ipq *ipq, struct label *ipqlabel);
292,296c290,294
< (struct ipq *ipq, struct label *ipqlabel,
< struct mbuf *datagram, struct label *datagramlabel);
< typedef void (*mpo_create_fragment_t)(struct mbuf *datagram,
< struct label *datagramlabel, struct mbuf *fragment,
< struct label *fragmentlabel);
---
> (struct ipq *ipq, struct label *ipqlabel, struct mbuf *m,
> struct label *mlabel);
> typedef void (*mpo_create_fragment_t)(struct mbuf *m,
> struct label *mlabel, struct mbuf *frag,
> struct label *fraglabel);
300,318c298,315
< typedef void (*mpo_create_mbuf_linklayer_t)(struct ifnet *ifnet,
< struct label *ifnetlabel, struct mbuf *mbuf,
< struct label *mbuflabel);
< typedef void (*mpo_create_mbuf_from_bpfdesc_t)(struct bpf_d *bpf_d,
< struct label *bpflabel, struct mbuf *mbuf,
< struct label *mbuflabel);
< typedef void (*mpo_create_mbuf_from_ifnet_t)(struct ifnet *ifnet,
< struct label *ifnetlabel, struct mbuf *mbuf,
< struct label *mbuflabel);
< typedef void (*mpo_create_mbuf_multicast_encap_t)(struct mbuf *oldmbuf,
< struct label *oldmbuflabel, struct ifnet *ifnet,
< struct label *ifnetlabel, struct mbuf *newmbuf,
< struct label *newmbuflabel);
< typedef void (*mpo_create_mbuf_netlayer_t)(struct mbuf *oldmbuf,
< struct label *oldmbuflabel, struct mbuf *newmbuf,
< struct label *newmbuflabel);
< typedef int (*mpo_fragment_match_t)(struct mbuf *fragment,
< struct label *fragmentlabel, struct ipq *ipq,
< struct label *ipqlabel);
---
> typedef void (*mpo_create_mbuf_linklayer_t)(struct ifnet *ifp,
> struct label *ifplabel, struct mbuf *m,
> struct label *mlabel);
> typedef void (*mpo_create_mbuf_from_bpfdesc_t)(struct bpf_d *d,
> struct label *dlabel, struct mbuf *m,
> struct label *mlabel);
> typedef void (*mpo_create_mbuf_from_ifnet_t)(struct ifnet *ifp,
> struct label *ifplabel, struct mbuf *m,
> struct label *mlabel);
> typedef void (*mpo_create_mbuf_multicast_encap_t)(struct mbuf *m,
> struct label *mlabel, struct ifnet *ifp,
> struct label *ifplabel, struct mbuf *mnew,
> struct label *mnewlabel);
> typedef void (*mpo_create_mbuf_netlayer_t)(struct mbuf *m,
> struct label *mlabel, struct mbuf *mnew,
> struct label *mnewlabel);
> typedef int (*mpo_fragment_match_t)(struct mbuf *m, struct label *mlabel,
> struct ipq *ipq, struct label *ipqlabel);
323,328c320,323
< typedef void (*mpo_relabel_ifnet_t)(struct ucred *cred,
< struct ifnet *ifnet, struct label *ifnetlabel,
< struct label *newlabel);
< typedef void (*mpo_update_ipq_t)(struct mbuf *fragment,
< struct label *fragmentlabel, struct ipq *ipq,
< struct label *ipqlabel);
---
> typedef void (*mpo_relabel_ifnet_t)(struct ucred *cred, struct ifnet *ifp,
> struct label *ifplabel, struct label *newlabel);
> typedef void (*mpo_update_ipq_t)(struct mbuf *m, struct label *mlabel,
> struct ipq *ipq, struct label *ipqlabel);
340c335
< struct mbuf *m, struct label *mbuf_label);
---
> struct mbuf *m, struct label *mlabel);
346c341
< struct label *vnodelabel, struct label *interpvnodelabel,
---
> struct label *vplabel, struct label *interpvnodelabel,
349c344
< struct vnode *vp, struct label *vnodelabel,
---
> struct vnode *vp, struct label *vplabel,
361,363c356,358
< typedef int (*mpo_check_bpfdesc_receive_t)(struct bpf_d *bpf_d,
< struct label *bpflabel, struct ifnet *ifnet,
< struct label *ifnetlabel);
---
> typedef int (*mpo_check_bpfdesc_receive_t)(struct bpf_d *d,
> struct label *dlabel, struct ifnet *ifp,
> struct label *ifplabel);
366,367c361,362
< typedef int (*mpo_check_cred_visible_t)(struct ucred *u1,
< struct ucred *u2);
---
> typedef int (*mpo_check_cred_visible_t)(struct ucred *cr1,
> struct ucred *cr2);
369c364
< struct ifnet *ifnet, struct label *ifnetlabel,
---
> struct ifnet *ifp, struct label *ifplabel,
371,373c366,368
< typedef int (*mpo_check_ifnet_transmit_t)(struct ifnet *ifnet,
< struct label *ifnetlabel, struct mbuf *m,
< struct label *mbuflabel);
---
> typedef int (*mpo_check_ifnet_transmit_t)(struct ifnet *ifp,
> struct label *ifplabel, struct mbuf *m,
> struct label *mlabel);
419c414
< struct label *vlabel);
---
> struct label *vplabel);
424c419
< struct mount *mp, struct label *mntlabel);
---
> struct mount *mp, struct label *mplabel);
427c422
< struct pipepair *pp, struct label *pipelabel,
---
> struct pipepair *pp, struct label *pplabel,
430c425
< struct pipepair *pp, struct label *pipelabel);
---
> struct pipepair *pp, struct label *pplabel);
432c427
< struct pipepair *pp, struct label *pipelabel);
---
> struct pipepair *pp, struct label *pplabel);
434c429
< struct pipepair *pp, struct label *pipelabel,
---
> struct pipepair *pp, struct label *pplabel,
437c432
< struct pipepair *pp, struct label *pipelabel);
---
> struct pipepair *pp, struct label *pplabel);
439c434
< struct pipepair *pp, struct label *pipelabel);
---
> struct pipepair *pp, struct label *pplabel);
453c448
< struct proc *proc);
---
> struct proc *p);
455c450
< struct proc *proc);
---
> struct proc *p);
478c473
< struct socket *so, struct label *socketlabel);
---
> struct socket *so, struct label *solabel);
480,481c475,476
< struct socket *so, struct label *socketlabel,
< struct sockaddr *sockaddr);
---
> struct socket *so, struct label *solabel,
> struct sockaddr *sa);
483,484c478,479
< struct socket *so, struct label *socketlabel,
< struct sockaddr *sockaddr);
---
> struct socket *so, struct label *solabel,
> struct sockaddr *sa);
488,489c483,484
< struct label *socketlabel, struct mbuf *m,
< struct label *mbuflabel);
---
> struct label *solabel, struct mbuf *m,
> struct label *mlabel);
491c486
< struct socket *so, struct label *socketlabel);
---
> struct socket *so, struct label *solabel);
493c488
< struct socket *so, struct label *socketlabel);
---
> struct socket *so, struct label *solabel);
495c490
< struct socket *so, struct label *socketlabel);
---
> struct socket *so, struct label *solabel);
497c492
< struct socket *so, struct label *socketlabel,
---
> struct socket *so, struct label *solabel,
500c495
< struct socket *so, struct label *socketlabel);
---
> struct socket *so, struct label *solabel);
502c497
< struct socket *so, struct label *socketlabel);
---
> struct socket *so, struct label *solabel);
504c499
< struct socket *so, struct label *socketlabel);
---
> struct socket *so, struct label *solabel);
506c501
< struct vnode *vp, struct label *vlabel);
---
> struct vnode *vp, struct label *vplabel);
514c509
< struct vnode *vp, struct label *label);
---
> struct vnode *vp, struct label *vplabel);
516c511
< struct vnode *vp, struct label *label);
---
> struct vnode *vp, struct label *vplabel);
521c516
< struct vnode *vp, struct label *label, int acc_mode);
---
> struct vnode *vp, struct label *vplabel, int acc_mode);
523c518
< struct vnode *dvp, struct label *dlabel);
---
> struct vnode *dvp, struct label *dvplabel);
525c520
< struct vnode *dvp, struct label *dlabel);
---
> struct vnode *dvp, struct label *dvplabel);
527c522
< struct vnode *dvp, struct label *dlabel,
---
> struct vnode *dvp, struct label *dvplabel,
530,531c525,526
< struct vnode *dvp, struct label *dlabel,
< struct vnode *vp, struct label *label,
---
> struct vnode *dvp, struct label *dvplabel,
> struct vnode *vp, struct label *vplabel,
534c529,530
< struct vnode *vp, struct label *label, acl_type_t type);
---
> struct vnode *vp, struct label *vplabel,
> acl_type_t type);
536,537c532,533
< struct vnode *vp, struct label *label, int attrnamespace,
< const char *name);
---
> struct vnode *vp, struct label *vplabel,
> int attrnamespace, const char *name);
539c535
< struct vnode *vp, struct label *label,
---
> struct vnode *vp, struct label *vplabel,
542c538,539
< struct vnode *vp, struct label *label, acl_type_t type);
---
> struct vnode *vp, struct label *vplabel,
> acl_type_t type);
544,545c541,542
< struct vnode *vp, struct label *label, int attrnamespace,
< const char *name, struct uio *uio);
---
> struct vnode *vp, struct label *vplabel,
> int attrnamespace, const char *name, struct uio *uio);
547,548c544,546
< struct vnode *dvp, struct label *dlabel, struct vnode *vp,
< struct label *label, struct componentname *cnp);
---
> struct vnode *dvp, struct label *dvplabel,
> struct vnode *vp, struct label *vplabel,
> struct componentname *cnp);
550c548
< struct vnode *vp, struct label *label,
---
> struct vnode *vp, struct label *vplabel,
553c551
< struct vnode *dvp, struct label *dlabel,
---
> struct vnode *dvp, struct label *dvplabel,
559c557
< struct vnode *vp, struct label *label, int *prot);
---
> struct vnode *vp, struct label *vplabel, int *prot);
561c559
< struct vnode *vp, struct label *label, int prot);
---
> struct vnode *vp, struct label *vplabel, int prot);
563c561
< struct vnode *vp, struct label *label, int acc_mode);
---
> struct vnode *vp, struct label *vplabel, int acc_mode);
566c564
< struct label *label);
---
> struct label *vplabel);
569c567
< struct label *label);
---
> struct label *vplabel);
571c569
< struct vnode *dvp, struct label *dlabel);
---
> struct vnode *dvp, struct label *dvplabel);
573c571
< struct vnode *vp, struct label *label);
---
> struct vnode *vp, struct label *vplabel);
575c573
< struct vnode *vp, struct label *vnodelabel,
---
> struct vnode *vp, struct label *vplabel,
578,579c576,577
< struct vnode *dvp, struct label *dlabel,
< struct vnode *vp, struct label *label,
---
> struct vnode *dvp, struct label *dvplabel,
> struct vnode *vp, struct label *vplabel,
582,583c580,581
< struct vnode *dvp, struct label *dlabel,
< struct vnode *vp, struct label *label, int samedir,
---
> struct vnode *dvp, struct label *dvplabel,
> struct vnode *vp, struct label *vplabel, int samedir,
586c584
< struct vnode *vp, struct label *label);
---
> struct vnode *vp, struct label *vplabel);
588c586
< struct vnode *vp, struct label *label, acl_type_t type,
---
> struct vnode *vp, struct label *vplabel, acl_type_t type,
591,592c589,590
< struct vnode *vp, struct label *label, int attrnamespace,
< const char *name, struct uio *uio);
---
> struct vnode *vp, struct label *vplabel,
> int attrnamespace, const char *name, struct uio *uio);
594c592
< struct vnode *vp, struct label *label, u_long flags);
---
> struct vnode *vp, struct label *vplabel, u_long flags);
596c594
< struct vnode *vp, struct label *label, mode_t mode);
---
> struct vnode *vp, struct label *vplabel, mode_t mode);
598c596
< struct vnode *vp, struct label *label, uid_t uid,
---
> struct vnode *vp, struct label *vplabel, uid_t uid,
601c599
< struct vnode *vp, struct label *label,
---
> struct vnode *vp, struct label *vplabel,
605c603
< struct label *label);
---
> struct label *vplabel);
608c606
< struct label *label);
---
> struct label *vplabel);