X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=security%2Fselinux%2FKconfig;h=2b517d6186729c05608d56dd1123926a242c61d2;hb=ce4796d1e16cf3761dc2a02b8d588667d05b3078;hp=293dbd6246c14009244243aacadc6889df90a018;hpb=db1a19b38f3a85f475b4ad716c71be133d8ca48e;p=linux-2.6 diff --git a/security/selinux/Kconfig b/security/selinux/Kconfig index 293dbd6246..2b517d6186 100644 --- 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. - 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. @@ -122,7 +122,7 @@ config SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT 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" @@ -137,7 +137,7 @@ config SECURITY_SELINUX_POLICYDB_VERSION_MAX Examples: For the Fedora Core 3 or 4 Linux distributions, enable this option - and set the value via the next option. For Fedore Core 5 and later, + 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. @@ -145,7 +145,7 @@ config SECURITY_SELINUX_POLICYDB_VERSION_MAX 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 + range 15 22 default 19 help This option sets the value for the maximum policy format version