chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
fe6d835
)
Remove IMA support
author
Andy Wingo
<wingo@pobox.com>
Sun, 19 Apr 2015 12:15:20 +0000
(14:15 +0200)
committer
Andy Wingo
<wingo@pobox.com>
Sun, 19 Apr 2015 12:21:51 +0000
(14:21 +0200)
configure.ac
patch
|
blob
|
history
src/shared/build.h
patch
|
blob
|
history
diff --git
a/configure.ac
b/configure.ac
index 55767290e9fdcc4ea8952a68deb100b536edb3e2..6dd9c9cdc5a45d53760fa77e2bd3790783f3d820 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-343,20
+343,6
@@
if test "x$enable_seccomp" != "xno"; then
fi
AM_CONDITIONAL(HAVE_SECCOMP, [test "$have_seccomp" = "yes"])
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]),
# ------------------------------------------------------------------------------
have_chkconfig=yes
AC_ARG_ENABLE([chkconfig], AS_HELP_STRING([--disable-chkconfig],[Disable optional chkconfig support]),
@@
-1313,7
+1299,6
@@
AC_MSG_RESULT([
libcryptsetup: ${have_libcryptsetup}
PAM: ${have_pam}
AUDIT: ${have_audit}
libcryptsetup: ${have_libcryptsetup}
PAM: ${have_pam}
AUDIT: ${have_audit}
- IMA: ${have_ima}
AppArmor: ${have_apparmor}
SELinux: ${have_selinux}
SECCOMP: ${have_seccomp}
AppArmor: ${have_apparmor}
SELinux: ${have_selinux}
SECCOMP: ${have_seccomp}
diff --git
a/src/shared/build.h
b/src/shared/build.h
index 720ab21fbe6a6bbc897b25f3f3aa55c2400a7db3..6514e591a5f04e8e651321ce554a6ac9f5025262 100644
(file)
--- a/
src/shared/build.h
+++ b/
src/shared/build.h
@@
-45,12
+45,6
@@
#define _APPARMOR_FEATURE_ "-APPARMOR"
#endif
#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
#ifdef HAVE_SMACK
#define _SMACK_FEATURE_ "+SMACK"
#else
@@
-121,7
+115,6
@@
_PAM_FEATURE_ " " \
_AUDIT_FEATURE_ " " \
_SELINUX_FEATURE_ " " \
_PAM_FEATURE_ " " \
_AUDIT_FEATURE_ " " \
_SELINUX_FEATURE_ " " \
- _IMA_FEATURE_ " " \
_APPARMOR_FEATURE_ " " \
_SMACK_FEATURE_ " " \
_LIBCRYPTSETUP_FEATURE_ " " \
_APPARMOR_FEATURE_ " " \
_SMACK_FEATURE_ " " \
_LIBCRYPTSETUP_FEATURE_ " " \