Remove libaudit support

diff --git a/configure.ac b/configure.ac
index ef47c5fcffa40c71f3e71ed11e25220040ac770b..0632c51c69146cdcbb4301123c55436862ae6203 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -485,43 +485,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]),
@@ -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 09ca99a1608f71052d37b0a5e48906978252dc1f..eeaf9891ea457a849933766799b0a1309e72a9bd 100644 (file)
--- 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 4abd0232f81802a3018067c8ad520f78be194d82..2b979aeb1b87197bf888847303ed591c80fc2add 100644 (file)
--- 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