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>

diff --git a/MAINTAINERS b/MAINTAINERS
index 28c69aaefcd94601a1bf8e3d096e2f89a5d1b5a8..5abb23e09fdccfa3ba99e93e4c9b4ef80bd576b3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3644,7 +3644,8 @@ P:        Eric Paris
 M:     eparis@parisplace.org
 L:     linux-kernel@vger.kernel.org (kernel issues)
 L:     selinux@tycho.nsa.gov (subscribers-only, general discussion)
-W:     http://www.nsa.gov/selinux
+W:     http://selinuxproject.org
+T:     git kernel.org:pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
 S:     Supported
 
 SENSABLE PHANTOM

diff --git a/security/selinux/Kconfig b/security/selinux/Kconfig
index a436d1cfa88b8ef68fec2de2addf3af4cc2e54e3..26301dd651d3a4722efde37d16855f3c622b71bc 100644 (file)
--- a/security/selinux/Kconfig
+++ b/security/selinux/Kconfig
@@ -6,9 +6,6 @@ config SECURITY_SELINUX
        help
          This selects NSA Security-Enhanced Linux (SELinux).
          You will also need a policy configuration and a labeled filesystem.
-         You can obtain the policy compiler (checkpolicy), the utility for
-         labeling filesystems (setfiles), and an example policy configuration
-         from <http://www.nsa.gov/selinux/>.
          If you are unsure how to answer this question, answer N.
 
 config SECURITY_SELINUX_BOOTPARAM