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/nfsserver | |
| 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/nfsserver')
| -rw-r--r-- | sys/nfsserver/nfs_srvsock.c | 3 | ||||
| -rw-r--r-- | sys/nfsserver/nfs_syscalls.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/nfsserver/nfs_srvsock.c b/sys/nfsserver/nfs_srvsock.c index ffeb4ef..eba9cfb 100644 --- a/sys/nfsserver/nfs_srvsock.c +++ b/sys/nfsserver/nfs_srvsock.c @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/kernel.h> #include <sys/lock.h> -#include <sys/mac.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/mount.h> @@ -69,6 +68,8 @@ __FBSDID("$FreeBSD$"); #include <nfs/xdr_subs.h> #include <nfsserver/nfsm_subs.h> +#include <security/mac/mac_framework.h> + #define TRUE 1 #define FALSE 0 diff --git a/sys/nfsserver/nfs_syscalls.c b/sys/nfsserver/nfs_syscalls.c index 5b261f1..b74325f 100644 --- a/sys/nfsserver/nfs_syscalls.c +++ b/sys/nfsserver/nfs_syscalls.c @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include <sys/file.h> #include <sys/filedesc.h> #include <sys/vnode.h> -#include <sys/mac.h> #include <sys/malloc.h> #include <sys/mount.h> #include <sys/proc.h> @@ -74,6 +73,8 @@ __FBSDID("$FreeBSD$"); #include <nfsserver/nfsm_subs.h> #include <nfsserver/nfsrvcache.h> +#include <security/mac/mac_framework.h> + static MALLOC_DEFINE(M_NFSSVC, "nfsserver_srvsock", "Nfs server structure"); MALLOC_DEFINE(M_NFSRVDESC, "nfsserver_srvdesc", "NFS server socket descriptor"); |
