[linux] 02/02: security: Enable DEFAULT_SECURITY_APPARMOR

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit 43a809fe933e3d9eb0f53f7bd80e3294c07e67cd
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Oct 26 22:51:36 2017 +0200

    security: Enable DEFAULT_SECURITY_APPARMOR
---
 debian/changelog     | 1 +
 debian/config/config | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5f1b565..9227974 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -330,6 +330,7 @@ linux (4.13.9-1) UNRELEASED; urgency=medium
   * Revert "bpf: one perf event close won't free bpf program attached ..."
     to avoid an ABI change
   * [armel] security: Enable SECURITY_APPARMOR and disable SECURITY_SELINUX
+  * security: Enable DEFAULT_SECURITY_APPARMOR
 
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 18 Oct 2017 20:03:01 +0100
 
diff --git a/debian/config/config b/debian/config/config
index 31ce576..cea4b05 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -7109,7 +7109,7 @@ CONFIG_HARDENED_USERCOPY=y
 # CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
 CONFIG_LOCK_DOWN_KERNEL=y
 ## choice: Default security module
-CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY_APPARMOR=y
 ## end choice
 
 ##

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git