summaryrefslogtreecommitdiffstats
path: root/sys/kern/kern_environment.c
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2007-10-24 19:04:04 +0000
committerrwatson <rwatson@FreeBSD.org>2007-10-24 19:04:04 +0000
commit60570a92bf794d255e5f8ed235b49c553776ad92 (patch)
treefea282db79628eed98808fd38cc46445b2f97ca5 /sys/kern/kern_environment.c
parent7781c2181af1113baab38322a55a90b5469cba03 (diff)
downloadFreeBSD-src-60570a92bf794d255e5f8ed235b49c553776ad92.zip
FreeBSD-src-60570a92bf794d255e5f8ed235b49c553776ad92.tar.gz
Merge first in a series of TrustedBSD MAC Framework KPI changes
from Mac OS X Leopard--rationalize naming for entry points to the following general forms: mac_<object>_<method/action> mac_<object>_check_<method/action> The previous naming scheme was inconsistent and mostly reversed from the new scheme. Also, make object types more consistent and remove spaces from object types that contain multiple parts ("posix_sem" -> "posixsem") to make mechanical parsing easier. Introduce a new "netinet" object type for certain IPv4/IPv6-related methods. Also simplify, slightly, some entry point names. All MAC policy modules will need to be recompiled, and modules not updates as part of this commit will need to be modified to conform to the new KPI. Sponsored by: SPARTA (original patches against Mac OS X) Obtained from: TrustedBSD Project, Apple Computer
Diffstat (limited to 'sys/kern/kern_environment.c')
-rw-r--r--sys/kern/kern_environment.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c
index ca20f38..34b1eec 100644
--- a/sys/kern/kern_environment.c
+++ b/sys/kern/kern_environment.c
@@ -95,7 +95,7 @@ kenv(td, uap)
error = 0;
if (uap->what == KENV_DUMP) {
#ifdef MAC
- error = mac_check_kenv_dump(td->td_ucred);
+ error = mac_kenv_check_dump(td->td_ucred);
if (error)
return (error);
#endif
@@ -148,7 +148,7 @@ kenv(td, uap)
switch (uap->what) {
case KENV_GET:
#ifdef MAC
- error = mac_check_kenv_get(td->td_ucred, name);
+ error = mac_kenv_check_get(td->td_ucred, name);
if (error)
goto done;
#endif
@@ -181,7 +181,7 @@ kenv(td, uap)
goto done;
}
#ifdef MAC
- error = mac_check_kenv_set(td->td_ucred, name, value);
+ error = mac_kenv_check_set(td->td_ucred, name, value);
if (error == 0)
#endif
setenv(name, value);
@@ -189,7 +189,7 @@ kenv(td, uap)
break;
case KENV_UNSET:
#ifdef MAC
- error = mac_check_kenv_unset(td->td_ucred, name);
+ error = mac_kenv_check_unset(td->td_ucred, name);
if (error)
goto done;
#endif
OpenPOWER on IntegriCloud