diff options
| author | Andy Wingo <wingo@pobox.com> | 2015-04-19 15:39:33 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2015-04-19 15:39:33 +0200 |
| commit | c3eb2a0d436cb84248f244353b28841e42e59abd (patch) | |
| tree | 0ae2d563cc066f1d9f4918f1b2d9ebe9ad29c9c3 | |
| parent | 70238105246969a045d0e256ed3983afe5ddbb96 (diff) | |
Remove libaudit support
| -rw-r--r-- | configure.ac | 38 | ||||
| -rw-r--r-- | src/shared/build.h | 7 | ||||
| -rw-r--r-- | src/shared/missing.h | 4 |
3 files changed, 0 insertions, 49 deletions
diff --git a/configure.ac b/configure.ac index ef47c5fcff..0632c51c69 100644 --- a/configure.ac +++ b/configure.ac @@ -486,43 +486,6 @@ fi AM_CONDITIONAL([HAVE_SMACK], [test "x$have_smack" = "xyes"]) # ------------------------------------------------------------------------------ -AC_ARG_ENABLE([audit], - AS_HELP_STRING([--disable-audit],[Disable optional AUDIT support]), - [case "${enableval}" in - yes) have_audit=yes ;; - no) have_audit=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for --disable-audit) ;; - esac], - [have_audit=auto]) - -if test "x${have_audit}" != xno ; then - AC_CHECK_HEADERS( - [libaudit.h], - [have_audit=yes], - [if test "x$have_audit" = xyes ; then - AC_MSG_ERROR([*** AUDIT headers not found.]) - fi]) - - AC_CHECK_LIB( - [audit], - [audit_open], - [have_audit=yes], - [if test "x$have_audit" = xyes ; then - AC_MSG_ERROR([*** libaudit not found.]) - fi]) - - if test "x$have_audit" = xyes ; then - AUDIT_LIBS="-laudit" - AC_DEFINE(HAVE_AUDIT, 1, [AUDIT available]) - else - have_audit=no - fi -else - AUDIT_LIBS= -fi -AC_SUBST(AUDIT_LIBS) - -# ------------------------------------------------------------------------------ AC_ARG_ENABLE([elfutils], AS_HELP_STRING([--disable-elfutils],[Disable optional ELFUTILS support]), [case "${enableval}" in @@ -1182,7 +1145,6 @@ AC_MSG_RESULT([ libcryptsetup: ${have_libcryptsetup} PAM: ${have_pam} - AUDIT: ${have_audit} AppArmor: ${have_apparmor} SELinux: ${have_selinux} SECCOMP: ${have_seccomp} diff --git a/src/shared/build.h b/src/shared/build.h index 09ca99a160..eeaf9891ea 100644 --- a/src/shared/build.h +++ b/src/shared/build.h @@ -27,12 +27,6 @@ #define _PAM_FEATURE_ "-PAM" #endif -#ifdef HAVE_AUDIT -#define _AUDIT_FEATURE_ "+AUDIT" -#else -#define _AUDIT_FEATURE_ "-AUDIT" -#endif - #ifdef HAVE_SELINUX #define _SELINUX_FEATURE_ "+SELINUX" #else @@ -95,7 +89,6 @@ #define SYSTEMD_FEATURES \ _PAM_FEATURE_ " " \ - _AUDIT_FEATURE_ " " \ _SELINUX_FEATURE_ " " \ _APPARMOR_FEATURE_ " " \ _SMACK_FEATURE_ " " \ diff --git a/src/shared/missing.h b/src/shared/missing.h index 4abd0232f8..2b979aeb1b 100644 --- a/src/shared/missing.h +++ b/src/shared/missing.h @@ -37,10 +37,6 @@ #include <linux/capability.h> #include <linux/neighbour.h> -#ifdef HAVE_AUDIT -#include <libaudit.h> -#endif - #ifdef ARCH_MIPS #include <asm/sgidefs.h> #endif |