diff options
| author | Andy Wingo <wingo@pobox.com> | 2015-04-19 14:15:20 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2015-04-19 14:21:51 +0200 |
| commit | 2b8a4d0a532c3bd4039f1a3ee6943ec0ef855f0d (patch) | |
| tree | a92086ecf316d5689bbc3208efcd01cb005be0fc | |
| parent | fe6d835c755c240d48f85c154caf2f36fa1b833b (diff) | |
Remove IMA support
| -rw-r--r-- | configure.ac | 15 | ||||
| -rw-r--r-- | src/shared/build.h | 7 |
2 files changed, 0 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac index 55767290e9..6dd9c9cdc5 100644 --- a/configure.ac +++ b/configure.ac @@ -344,20 +344,6 @@ fi AM_CONDITIONAL(HAVE_SECCOMP, [test "$have_seccomp" = "yes"]) # ------------------------------------------------------------------------------ -have_ima=yes -AC_ARG_ENABLE([ima], AS_HELP_STRING([--disable-ima],[Disable optional IMA support]), - [case "${enableval}" in - yes) have_ima=yes ;; - no) have_ima=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for --disable-ima) ;; - esac], - [have_ima=yes]) - -if test "x${have_ima}" != xno ; then - AC_DEFINE(HAVE_IMA, 1, [Define if IMA is available]) -fi - -# ------------------------------------------------------------------------------ have_chkconfig=yes AC_ARG_ENABLE([chkconfig], AS_HELP_STRING([--disable-chkconfig],[Disable optional chkconfig support]), [case "${enableval}" in @@ -1313,7 +1299,6 @@ AC_MSG_RESULT([ libcryptsetup: ${have_libcryptsetup} PAM: ${have_pam} AUDIT: ${have_audit} - IMA: ${have_ima} AppArmor: ${have_apparmor} SELinux: ${have_selinux} SECCOMP: ${have_seccomp} diff --git a/src/shared/build.h b/src/shared/build.h index 720ab21fbe..6514e591a5 100644 --- a/src/shared/build.h +++ b/src/shared/build.h @@ -45,12 +45,6 @@ #define _APPARMOR_FEATURE_ "-APPARMOR" #endif -#ifdef HAVE_IMA -#define _IMA_FEATURE_ "+IMA" -#else -#define _IMA_FEATURE_ "-IMA" -#endif - #ifdef HAVE_SMACK #define _SMACK_FEATURE_ "+SMACK" #else @@ -121,7 +115,6 @@ _PAM_FEATURE_ " " \ _AUDIT_FEATURE_ " " \ _SELINUX_FEATURE_ " " \ - _IMA_FEATURE_ " " \ _APPARMOR_FEATURE_ " " \ _SMACK_FEATURE_ " " \ _LIBCRYPTSETUP_FEATURE_ " " \ |