aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Smalley <sds@tycho.nsa.gov>2008-09-11 09:20:26 -0400
committerJames Morris <jmorris@namei.org>2008-09-11 10:44:08 -0400
commitf058925b201357fba48d56cc9c1719ae274b2022 (patch)
tree796868dcdeb2ee3e2d296eeb25a8cedbb422a5a1
parentb56c8c221d192e4ffa719d00907c3b60fbaa2737 (diff)
Update selinux info in MAINTAINERS and Kconfig help text
Update the SELinux entry in MAINTAINERS and drop the obsolete information from the selinux Kconfig help text. Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov> Signed-off-by: James Morris <jmorris@namei.org>
-rw-r--r--MAINTAINERS3
-rw-r--r--security/selinux/Kconfig3
2 files changed, 2 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 28c69aaefcd9..5abb23e09fdc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3644,7 +3644,8 @@ P: Eric Paris
3644M: eparis@parisplace.org 3644M: eparis@parisplace.org
3645L: linux-kernel@vger.kernel.org (kernel issues) 3645L: linux-kernel@vger.kernel.org (kernel issues)
3646L: selinux@tycho.nsa.gov (subscribers-only, general discussion) 3646L: selinux@tycho.nsa.gov (subscribers-only, general discussion)
3647W: http://www.nsa.gov/selinux 3647W: http://selinuxproject.org
3648T: git kernel.org:pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
3648S: Supported 3649S: Supported
3649 3650
3650SENSABLE PHANTOM 3651SENSABLE PHANTOM
diff --git a/security/selinux/Kconfig b/security/selinux/Kconfig
index a436d1cfa88b..26301dd651d3 100644
--- a/security/selinux/Kconfig
+++ b/security/selinux/Kconfig
@@ -6,9 +6,6 @@ config SECURITY_SELINUX
6 help 6 help
7 This selects NSA Security-Enhanced Linux (SELinux). 7 This selects NSA Security-Enhanced Linux (SELinux).
8 You will also need a policy configuration and a labeled filesystem. 8 You will also need a policy configuration and a labeled filesystem.
9 You can obtain the policy compiler (checkpolicy), the utility for
10 labeling filesystems (setfiles), and an example policy configuration
11 from <http://www.nsa.gov/selinux/>.
12 If you are unsure how to answer this question, answer N. 9 If you are unsure how to answer this question, answer N.
13 10
14config SECURITY_SELINUX_BOOTPARAM 11config SECURITY_SELINUX_BOOTPARAM