54c54
< __FBSDID("$FreeBSD: head/sys/security/mac/mac_system.c 189797 2009-03-14 16:06:06Z rwatson $");
---
> __FBSDID("$FreeBSD: head/sys/security/mac/mac_system.c 191731 2009-05-01 21:05:40Z rwatson $");
81c81
< MAC_CHECK_NOSLEEP(kenv_check_dump, cred);
---
> MAC_POLICY_CHECK_NOSLEEP(kenv_check_dump, cred);
94c94
< MAC_CHECK_NOSLEEP(kenv_check_get, cred, name);
---
> MAC_POLICY_CHECK_NOSLEEP(kenv_check_get, cred, name);
108c108
< MAC_CHECK_NOSLEEP(kenv_check_set, cred, name, value);
---
> MAC_POLICY_CHECK_NOSLEEP(kenv_check_set, cred, name, value);
121c121
< MAC_CHECK_NOSLEEP(kenv_check_unset, cred, name);
---
> MAC_POLICY_CHECK_NOSLEEP(kenv_check_unset, cred, name);
136c136
< MAC_CHECK(kld_check_load, cred, vp, vp->v_label);
---
> MAC_POLICY_CHECK(kld_check_load, cred, vp, vp->v_label);
149c149
< MAC_CHECK_NOSLEEP(kld_check_stat, cred);
---
> MAC_POLICY_CHECK_NOSLEEP(kld_check_stat, cred);
167c167
< MAC_CHECK(system_check_acct, cred, vp,
---
> MAC_POLICY_CHECK(system_check_acct, cred, vp,
181c181
< MAC_CHECK_NOSLEEP(system_check_reboot, cred, howto);
---
> MAC_POLICY_CHECK_NOSLEEP(system_check_reboot, cred, howto);
197c197
< MAC_CHECK(system_check_swapon, cred, vp, vp->v_label);
---
> MAC_POLICY_CHECK(system_check_swapon, cred, vp, vp->v_label);
213c213
< MAC_CHECK(system_check_swapoff, cred, vp, vp->v_label);
---
> MAC_POLICY_CHECK(system_check_swapoff, cred, vp, vp->v_label);
232c232,233
< MAC_CHECK_NOSLEEP(system_check_sysctl, cred, oidp, arg1, arg2, req);
---
> MAC_POLICY_CHECK_NOSLEEP(system_check_sysctl, cred, oidp, arg1, arg2,
> req);