diff options
| author | rwatson <rwatson@FreeBSD.org> | 2007-10-25 07:49:47 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2007-10-25 07:49:47 +0000 |
| commit | 94fbc001c8703dcde08373077f205386188204a9 (patch) | |
| tree | 2b2bf123e4e2c0162530484d7e07617bc51aa99a /sys/security/mac_lomac/mac_lomac.c | |
| parent | 7205d51f8d46369ba85c9260a36b421a72cfedbf (diff) | |
| download | FreeBSD-src-94fbc001c8703dcde08373077f205386188204a9.zip FreeBSD-src-94fbc001c8703dcde08373077f205386188204a9.tar.gz | |
Further MAC Framework cleanup: normalize some local variable names and
clean up some comments.
Obtained from: TrustedBSD Project
Diffstat (limited to 'sys/security/mac_lomac/mac_lomac.c')
| -rw-r--r-- | sys/security/mac_lomac/mac_lomac.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/security/mac_lomac/mac_lomac.c b/sys/security/mac_lomac/mac_lomac.c index 8b44a09..e66cfe9 100644 --- a/sys/security/mac_lomac/mac_lomac.c +++ b/sys/security/mac_lomac/mac_lomac.c @@ -1483,7 +1483,7 @@ mac_lomac_mbuf_create_from_firewall(struct mbuf *m, struct label *mlabel) */ static void mac_lomac_vnode_execve_transition(struct ucred *old, struct ucred *new, - struct vnode *vp, struct label *vplabel, struct label *interpvnodelabel, + struct vnode *vp, struct label *vplabel, struct label *interpvplabel, struct image_params *imgp, struct label *execlabel) { struct mac_lomac *source, *dest, *obj, *robj; @@ -1491,7 +1491,7 @@ mac_lomac_vnode_execve_transition(struct ucred *old, struct ucred *new, source = SLOT(old->cr_label); dest = SLOT(new->cr_label); obj = SLOT(vplabel); - robj = interpvnodelabel != NULL ? SLOT(interpvnodelabel) : obj; + robj = interpvplabel != NULL ? SLOT(interpvplabel) : obj; mac_lomac_copy(source, dest); /* @@ -1519,7 +1519,7 @@ mac_lomac_vnode_execve_transition(struct ucred *old, struct ucred *new, static int mac_lomac_vnode_execve_will_transition(struct ucred *old, struct vnode *vp, - struct label *vplabel, struct label *interpvnodelabel, + struct label *vplabel, struct label *interpvplabel, struct image_params *imgp, struct label *execlabel) { struct mac_lomac *subj, *obj, *robj; @@ -1529,7 +1529,7 @@ mac_lomac_vnode_execve_will_transition(struct ucred *old, struct vnode *vp, subj = SLOT(old->cr_label); obj = SLOT(vplabel); - robj = interpvnodelabel != NULL ? SLOT(interpvnodelabel) : obj; + robj = interpvplabel != NULL ? SLOT(interpvplabel) : obj; return ((robj->ml_flags & MAC_LOMAC_FLAG_AUX && !mac_lomac_dominate_element(&robj->ml_auxsingle, &subj->ml_single) |
