NFS: Kill the obsolete NFS_PARANOIA

[powerpc.git] / security / selinux / Kconfig

diff --git a/security/selinux/Kconfig b/security/selinux/Kconfig
index 814ddc4..b32a459 100644 (file)
--- a/security/selinux/Kconfig
+++ b/security/selinux/Kconfig
@@ -112,7 +112,7 @@ config SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT
          your distribution will provide these and enable the new controls
          in the kernel they also distribute.
 
          your distribution will provide these and enable the new controls
          in the kernel they also distribute.
 

-         Note that this option can be overriden at boot with the
+         Note that this option can be overridden at boot with the

          selinux_compat_net parameter, and after boot via
          /selinux/compat_net.  See Documentation/kernel-parameters.txt
          for details on this parameter.
          selinux_compat_net parameter, and after boot via
          /selinux/compat_net.  See Documentation/kernel-parameters.txt
          for details on this parameter.


@@ -122,5 +122,42 @@ config SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT
          well as any conntrack helpers for protocols which you
          wish to control.
 
          well as any conntrack helpers for protocols which you
          wish to control.
 

-         If you are unsure what do do here, select N.
+         If you are unsure what to do here, select N.
+
+config SECURITY_SELINUX_POLICYDB_VERSION_MAX
+       bool "NSA SELinux maximum supported policy format version"
+       depends on SECURITY_SELINUX
+       default n
+       help
+         This option enables the maximum policy format version supported
+         by SELinux to be set to a particular value.  This value is reported
+         to userspace via /selinux/policyvers and used at policy load time.
+         It can be adjusted downward to support legacy userland (init) that
+         does not correctly handle kernels that support newer policy versions.
+
+         Examples:
+         For the Fedora Core 3 or 4 Linux distributions, enable this option
+         and set the value via the next option. For Fedora Core 5 and later,
+         do not enable this option.
+
+         If you are unsure how to answer this question, answer N.
+
+config SECURITY_SELINUX_POLICYDB_VERSION_MAX_VALUE
+       int "NSA SELinux maximum supported policy format version value"
+       depends on SECURITY_SELINUX_POLICYDB_VERSION_MAX
+       range 15 21
+       default 19
+       help
+         This option sets the value for the maximum policy format version
+         supported by SELinux.
+
+         Examples:
+         For Fedora Core 3, use 18.
+         For Fedora Core 4, use 19.
+
+         If you are unsure how to answer this question, look for the
+         policy format version supported by your policy toolchain, by
+         running 'checkpolicy -V'. Or look at what policy you have
+         installed under /etc/selinux/$SELINUXTYPE/policy, where
+         SELINUXTYPE is defined in your /etc/selinux/config.