security: Enable APPARMOR (Closes: #598408)

svn path=/dists/trunk/linux-2.6/; revision=18395
This commit is contained in:
Ben Hutchings 2011-12-18 18:32:54 +00:00
parent fd6ad13765
commit 9c0dcfd33f
2 changed files with 3 additions and 1 deletions

1
debian/changelog vendored
View File

@ -8,6 +8,7 @@ linux-2.6 (3.2~rc5-1~experimental.1) UNRELEASED; urgency=low
[ Ben Hutchings ]
* [x86] et131x: Include driver in installer (Closes: #651440)
* security: Enable APPARMOR (Closes: #598408)
[ Uwe Kleine-König ]
* [amd64] Update rt featureset to 3.2-rc5-rt8

View File

@ -4650,7 +4650,8 @@ CONFIG_DEFAULT_SECURITY_DAC=y
##
## file: security/apparmor/Kconfig
##
# CONFIG_SECURITY_APPARMOR is not set
CONFIG_SECURITY_APPARMOR=y
CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
##
## file: security/integrity/ima/Kconfig