diff options
| author | rwatson <rwatson@FreeBSD.org> | 2009-06-05 14:55:22 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2009-06-05 14:55:22 +0000 |
| commit | f4934662e5d837053e785525653e390ce6933d2b (patch) | |
| tree | 476e08b4812ed877bdf927598a5c7deae99fdcdf /sys/nfsserver | |
| parent | 4df1a4e912a3f28cda78498cc27541eb191be270 (diff) | |
| download | FreeBSD-src-f4934662e5d837053e785525653e390ce6933d2b.zip FreeBSD-src-f4934662e5d837053e785525653e390ce6933d2b.tar.gz | |
Move "options MAC" from opt_mac.h to opt_global.h, as it's now in GENERIC
and used in a large number of files, but also because an increasing number
of incorrect uses of MAC calls were sneaking in due to copy-and-paste of
MAC-aware code without the associated opt_mac.h include.
Discussed with: pjd
Diffstat (limited to 'sys/nfsserver')
| -rw-r--r-- | sys/nfsserver/nfs_srvkrpc.c | 2 | ||||
| -rw-r--r-- | sys/nfsserver/nfs_srvsock.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/nfsserver/nfs_srvkrpc.c b/sys/nfsserver/nfs_srvkrpc.c index 2b3b48a..12f40c8 100644 --- a/sys/nfsserver/nfs_srvkrpc.c +++ b/sys/nfsserver/nfs_srvkrpc.c @@ -81,6 +81,8 @@ __FBSDID("$FreeBSD$"); #include <nfsserver/nfsrvcache.h> #include <nfsserver/nfs_fha.h> +#include <security/mac/mac_framework.h> + #ifndef NFS_LEGACYRPC static MALLOC_DEFINE(M_NFSSVC, "nfss_srvsock", "Nfs server structure"); diff --git a/sys/nfsserver/nfs_srvsock.c b/sys/nfsserver/nfs_srvsock.c index db48869..13679ef 100644 --- a/sys/nfsserver/nfs_srvsock.c +++ b/sys/nfsserver/nfs_srvsock.c @@ -39,8 +39,6 @@ __FBSDID("$FreeBSD$"); * Socket operations for use by nfs */ -#include "opt_mac.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/jail.h> |
