diff options
| author | rwatson <rwatson@FreeBSD.org> | 2006-10-22 11:52:19 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2006-10-22 11:52:19 +0000 |
| commit | 7beaaf5cd2391ef1f8159791b46dbeb83ab0c2fb (patch) | |
| tree | 15bbe7ba3ad64d39db33baa0b88a2dae4206568e /sys/compat/svr4 | |
| parent | cbcb760109a202fb847f48aa942a8b84b1e85015 (diff) | |
| download | FreeBSD-src-7beaaf5cd2391ef1f8159791b46dbeb83ab0c2fb.zip FreeBSD-src-7beaaf5cd2391ef1f8159791b46dbeb83ab0c2fb.tar.gz | |
Complete break-out of sys/sys/mac.h into sys/security/mac/mac_framework.h
begun with a repo-copy of mac.h to mac_framework.h. sys/mac.h now
contains the userspace and user<->kernel API and definitions, with all
in-kernel interfaces moved to mac_framework.h, which is now included
across most of the kernel instead.
This change is the first step in a larger cleanup and sweep of MAC
Framework interfaces in the kernel, and will not be MFC'd.
Obtained from: TrustedBSD Project
Sponsored by: SPARTA
Diffstat (limited to 'sys/compat/svr4')
| -rw-r--r-- | sys/compat/svr4/svr4_fcntl.c | 3 | ||||
| -rw-r--r-- | sys/compat/svr4/svr4_misc.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/compat/svr4/svr4_fcntl.c b/sys/compat/svr4/svr4_fcntl.c index ad74838..ca135f0 100644 --- a/sys/compat/svr4/svr4_fcntl.c +++ b/sys/compat/svr4/svr4_fcntl.c @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include <sys/filedesc.h> /*#include <sys/ioctl.h>*/ #include <sys/lock.h> -#include <sys/mac.h> #include <sys/malloc.h> #include <sys/mount.h> #include <sys/mutex.h> @@ -60,6 +59,8 @@ __FBSDID("$FreeBSD$"); #include <compat/svr4/svr4_util.h> #include <compat/svr4/svr4_fcntl.h> +#include <security/mac/mac_framework.h> + static int svr4_to_bsd_flags(int); static u_long svr4_to_bsd_cmd(u_long); static int fd_revoke(struct thread *, int); diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c index 6701cf8..9ed5bb3 100644 --- a/sys/compat/svr4/svr4_misc.c +++ b/sys/compat/svr4/svr4_misc.c @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include <sys/imgact.h> #include <sys/kernel.h> #include <sys/lock.h> -#include <sys/mac.h> #include <sys/malloc.h> #include <sys/file.h> /* Must come after sys/malloc.h */ #include <sys/mman.h> @@ -83,6 +82,8 @@ __FBSDID("$FreeBSD$"); #include <compat/svr4/svr4_mman.h> #include <compat/svr4/svr4_wait.h> +#include <security/mac/mac_framework.h> + #include <machine/vmparam.h> #include <vm/vm.h> #include <vm/vm_param.h> |
