diff --git a/debian/changelog b/debian/changelog index f667f5c0b..cfdbe085e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ linux-2.6 (3.1.0-1~experimental.1) UNRELEASED; urgency=low * Use shorter versions in the package names. * Remove linux-tools-* binary package. * Drop external module packages stuff. + * Set default security module to Unix Discretionary Access Controls. -- Ben Hutchings Tue, 27 Sep 2011 06:02:56 +0100 diff --git a/debian/config/config b/debian/config/config index 535ffa20f..96f3e0d7f 100644 --- a/debian/config/config +++ b/debian/config/config @@ -4447,9 +4447,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y # CONFIG_INTEL_TXT is not set CONFIG_LSM_MMAP_MIN_ADDR=32768 ## choice: Default security module -CONFIG_DEFAULT_SECURITY_SELINUX=y -# CONFIG_DEFAULT_SECURITY_TOMOYO is not set -# CONFIG_DEFAULT_SECURITY_DAC is not set +CONFIG_DEFAULT_SECURITY_DAC=y ## end choice ##