Prev: [PATCH 12/13] AppArmor: Enable configuring and building of the AppArmor security module
Next: [PATCH 07/13] AppArmor: userspace interfaces
From: John Johansen on 14 Jul 2010 20:50
Signed-off-by: John Johansen <john.johansen(a)canonical.com>
---
Documentation/kernel-parameters.txt | 8 ++++++++
MAINTAINERS | 8 ++++++++
2 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 82d6aeb..0cceb09 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -93,6 +93,7 @@ parameter is applicable:
Documentation/scsi/.
SECURITY Different security models are enabled.
SELINUX SELinux support is enabled.
+ APPARMOR AppArmor support is enabled.
SERIAL Serial support is enabled.
SH SuperH architecture is enabled.
SMP The kernel is an SMP kernel.
@@ -2312,6 +2313,13 @@ and is between 256 and 4096 characters. It is defined in the file
If enabled at boot time, /selinux/disable can be used
later to disable prior to initial policy load.

+ apparmor= [APPARMOR] Disable or enable AppArmor at boot time
+ Format: { "0" | "1" }
+ See security/apparmor/Kconfig help text
+ 0 -- disable.
+ 1 -- enable.
+ Default value is set via kernel config option.
+
serialnumber [BUGS=X86-32]

shapers= [NET]
diff --git a/MAINTAINERS b/MAINTAINERS
index 5884812..7a32382 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5061,6 +5061,14 @@ S: Supported
F: include/linux/selinux*
F: security/selinux/

+APPARMOR SECURITY MODULE
+M: John Johansen <john.johansen(a)canonical.com>
+L: apparmor(a)lists.ubuntu.com (subscribers-only, general discussion)
+W: apparmor.wiki.kernel.org
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/jj/apparmor-dev.git
+S: Supported
+F: security/apparmor/
+
SENSABLE PHANTOM
M: Jiri Slaby <jirislaby(a)gmail.com>
S: Maintained
--
1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH 12/13] AppArmor: Enable configuring and building of the AppArmor security module
Next: [PATCH 07/13] AppArmor: userspace interfaces