39c39
< __FBSDID("$FreeBSD: head/sys/security/mac/mac_process.c 165469 2006-12-22 23:34:47Z rwatson $");
---
> __FBSDID("$FreeBSD: head/sys/security/mac/mac_process.c 168955 2007-04-22 19:55:56Z rwatson $");
449c449
< mac_check_cred_visible(struct ucred *u1, struct ucred *u2)
---
> mac_check_cred_visible(struct ucred *cr1, struct ucred *cr2)
453c453
< MAC_CHECK(check_cred_visible, u1, u2);
---
> MAC_CHECK(check_cred_visible, cr1, cr2);
459c459
< mac_check_proc_debug(struct ucred *cred, struct proc *proc)
---
> mac_check_proc_debug(struct ucred *cred, struct proc *p)
463c463
< PROC_LOCK_ASSERT(proc, MA_OWNED);
---
> PROC_LOCK_ASSERT(p, MA_OWNED);
465c465
< MAC_CHECK(check_proc_debug, cred, proc);
---
> MAC_CHECK(check_proc_debug, cred, p);
471c471
< mac_check_proc_sched(struct ucred *cred, struct proc *proc)
---
> mac_check_proc_sched(struct ucred *cred, struct proc *p)
475c475
< PROC_LOCK_ASSERT(proc, MA_OWNED);
---
> PROC_LOCK_ASSERT(p, MA_OWNED);
477c477
< MAC_CHECK(check_proc_sched, cred, proc);
---
> MAC_CHECK(check_proc_sched, cred, p);
483c483
< mac_check_proc_signal(struct ucred *cred, struct proc *proc, int signum)
---
> mac_check_proc_signal(struct ucred *cred, struct proc *p, int signum)
487c487
< PROC_LOCK_ASSERT(proc, MA_OWNED);
---
> PROC_LOCK_ASSERT(p, MA_OWNED);
489c489
< MAC_CHECK(check_proc_signal, cred, proc, signum);
---
> MAC_CHECK(check_proc_signal, cred, p, signum);
495c495
< mac_check_proc_setuid(struct proc *proc, struct ucred *cred, uid_t uid)
---
> mac_check_proc_setuid(struct proc *p, struct ucred *cred, uid_t uid)
499c499
< PROC_LOCK_ASSERT(proc, MA_OWNED);
---
> PROC_LOCK_ASSERT(p, MA_OWNED);
506c506
< mac_check_proc_seteuid(struct proc *proc, struct ucred *cred, uid_t euid)
---
> mac_check_proc_seteuid(struct proc *p, struct ucred *cred, uid_t euid)
510c510
< PROC_LOCK_ASSERT(proc, MA_OWNED);
---
> PROC_LOCK_ASSERT(p, MA_OWNED);
517c517
< mac_check_proc_setgid(struct proc *proc, struct ucred *cred, gid_t gid)
---
> mac_check_proc_setgid(struct proc *p, struct ucred *cred, gid_t gid)
521c521
< PROC_LOCK_ASSERT(proc, MA_OWNED);
---
> PROC_LOCK_ASSERT(p, MA_OWNED);
523a524
>
528c529
< mac_check_proc_setegid(struct proc *proc, struct ucred *cred, gid_t egid)
---
> mac_check_proc_setegid(struct proc *p, struct ucred *cred, gid_t egid)
532c533
< PROC_LOCK_ASSERT(proc, MA_OWNED);
---
> PROC_LOCK_ASSERT(p, MA_OWNED);
534a536
>
539,540c541,542
< mac_check_proc_setgroups(struct proc *proc, struct ucred *cred,
< int ngroups, gid_t *gidset)
---
> mac_check_proc_setgroups(struct proc *p, struct ucred *cred, int ngroups,
> gid_t *gidset)
544c546
< PROC_LOCK_ASSERT(proc, MA_OWNED);
---
> PROC_LOCK_ASSERT(p, MA_OWNED);
551,552c553,554
< mac_check_proc_setreuid(struct proc *proc, struct ucred *cred, uid_t ruid,
< uid_t euid)
---
> mac_check_proc_setreuid(struct proc *p, struct ucred *cred, uid_t ruid,
> uid_t euid)
556c558
< PROC_LOCK_ASSERT(proc, MA_OWNED);
---
> PROC_LOCK_ASSERT(p, MA_OWNED);
558a561
>
564c567
< gid_t egid)
---
> gid_t egid)
570a574
>
575,576c579,580
< mac_check_proc_setresuid(struct proc *proc, struct ucred *cred, uid_t ruid,
< uid_t euid, uid_t suid)
---
> mac_check_proc_setresuid(struct proc *p, struct ucred *cred, uid_t ruid,
> uid_t euid, uid_t suid)
580c584
< PROC_LOCK_ASSERT(proc, MA_OWNED);
---
> PROC_LOCK_ASSERT(p, MA_OWNED);
587,588c591,592
< mac_check_proc_setresgid(struct proc *proc, struct ucred *cred, gid_t rgid,
< gid_t egid, gid_t sgid)
---
> mac_check_proc_setresgid(struct proc *p, struct ucred *cred, gid_t rgid,
> gid_t egid, gid_t sgid)
592c596
< PROC_LOCK_ASSERT(proc, MA_OWNED);
---
> PROC_LOCK_ASSERT(p, MA_OWNED);
594a599
>
599c604
< mac_check_proc_wait(struct ucred *cred, struct proc *proc)
---
> mac_check_proc_wait(struct ucred *cred, struct proc *p)
603c608
< PROC_LOCK_ASSERT(proc, MA_OWNED);
---
> PROC_LOCK_ASSERT(p, MA_OWNED);
605c610
< MAC_CHECK(check_proc_wait, cred, proc);
---
> MAC_CHECK(check_proc_wait, cred, p);