diff options
author | rwatson <rwatson@FreeBSD.org> | 2005-07-14 10:46:03 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2005-07-14 10:46:03 +0000 |
commit | 0889b696347f30e85c820821cd9c5542eea4c71c (patch) | |
tree | e9087eafc0a39458679b67c1f2726b58d8bf9741 /sys/security/mac | |
parent | 79690d711b47ea3433f60ffea399d4d3e2f6c0a7 (diff) | |
download | FreeBSD-src-0889b696347f30e85c820821cd9c5542eea4c71c.zip FreeBSD-src-0889b696347f30e85c820821cd9c5542eea4c71c.tar.gz |
Bump the module versions of the MAC Framework and MAC policy modules
from 2 (6.x) to 3 (7.x) to allow for future changes in the MAC policy
module ABI in 7.x.
Obtained from: TrustedBSD Project
Diffstat (limited to 'sys/security/mac')
-rw-r--r-- | sys/security/mac/mac_framework.c | 6 | ||||
-rw-r--r-- | sys/security/mac/mac_policy.h | 2 | ||||
-rw-r--r-- | sys/security/mac/mac_syscalls.c | 6 |
3 files changed, 11 insertions, 3 deletions
diff --git a/sys/security/mac/mac_framework.c b/sys/security/mac/mac_framework.c index 9e8d45a..5bb70d1 100644 --- a/sys/security/mac/mac_framework.c +++ b/sys/security/mac/mac_framework.c @@ -2,6 +2,7 @@ * Copyright (c) 1999-2002 Robert N. M. Watson * Copyright (c) 2001 Ilmar S. Habibulin * Copyright (c) 2001-2005 Networks Associates Technology, Inc. + * Copyright (c) 2005 SPARTA, Inc. * All rights reserved. * * This software was developed by Robert Watson and Ilmar Habibulin for the @@ -12,6 +13,9 @@ * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), * as part of the DARPA CHATS research program. * + * This software was enhanced by SPARTA ISSO under SPAWAR contract + * N66001-04-C-6019 ("SEFOS"). + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -97,7 +101,7 @@ __FBSDID("$FreeBSD$"); * modules to refuse to be loaded if the necessary support isn't present, * even if it's pre-boot. */ -MODULE_VERSION(kernel_mac_support, 2); +MODULE_VERSION(kernel_mac_support, 3); SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0, "TrustedBSD MAC policy controls"); diff --git a/sys/security/mac/mac_policy.h b/sys/security/mac/mac_policy.h index 506f7d0..2342013 100644 --- a/sys/security/mac/mac_policy.h +++ b/sys/security/mac/mac_policy.h @@ -618,7 +618,7 @@ struct mac_policy_conf { mac_policy_modevent, \ &mpname##_mac_policy_conf \ }; \ - MODULE_DEPEND(mpname, kernel_mac_support, 2, 2, 2); \ + MODULE_DEPEND(mpname, kernel_mac_support, 3, 3, 3); \ DECLARE_MODULE(mpname, mpname##_mod, SI_SUB_MAC_POLICY, \ SI_ORDER_MIDDLE) diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c index 9e8d45a..5bb70d1 100644 --- a/sys/security/mac/mac_syscalls.c +++ b/sys/security/mac/mac_syscalls.c @@ -2,6 +2,7 @@ * Copyright (c) 1999-2002 Robert N. M. Watson * Copyright (c) 2001 Ilmar S. Habibulin * Copyright (c) 2001-2005 Networks Associates Technology, Inc. + * Copyright (c) 2005 SPARTA, Inc. * All rights reserved. * * This software was developed by Robert Watson and Ilmar Habibulin for the @@ -12,6 +13,9 @@ * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), * as part of the DARPA CHATS research program. * + * This software was enhanced by SPARTA ISSO under SPAWAR contract + * N66001-04-C-6019 ("SEFOS"). + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -97,7 +101,7 @@ __FBSDID("$FreeBSD$"); * modules to refuse to be loaded if the necessary support isn't present, * even if it's pre-boot. */ -MODULE_VERSION(kernel_mac_support, 2); +MODULE_VERSION(kernel_mac_support, 3); SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0, "TrustedBSD MAC policy controls"); |