chiark / gitweb /
Remove IMA support
authorAndy Wingo <wingo@pobox.com>
Sun, 19 Apr 2015 12:15:20 +0000 (14:15 +0200)
committerAndy Wingo <wingo@pobox.com>
Sun, 19 Apr 2015 12:21:51 +0000 (14:21 +0200)
configure.ac
src/shared/build.h

index 5576729..6dd9c9c 100644 (file)
@@ -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}
index 720ab21..6514e59 100644 (file)
 #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
         _PAM_FEATURE_ " "                                               \
         _AUDIT_FEATURE_ " "                                             \
         _SELINUX_FEATURE_ " "                                           \
-        _IMA_FEATURE_ " "                                               \
         _APPARMOR_FEATURE_ " "                                          \
         _SMACK_FEATURE_ " "                                             \
         _LIBCRYPTSETUP_FEATURE_ " "                                     \