From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 21 May 2025 10:22:40 +0000 (+0200)
Subject: tree-wide: Include <libaudit.h> via libaudit-util.h
X-Git-Tag: v258-rc1~555^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdd5fac06856a70ce0afea99cd7b3a2ca50314a0;p=thirdparty%2Fsystemd.git

tree-wide: Include <libaudit.h> via libaudit-util.h

Let's keep the ifdeffery for the include in one place.
---

diff --git a/src/core/audit-fd.c b/src/core/audit-fd.c
index b09f3ac49a5..6150e7e43e5 100644
--- a/src/core/audit-fd.c
+++ b/src/core/audit-fd.c
@@ -3,19 +3,13 @@
 #include <errno.h>
 
 #include "audit-fd.h"
-
-#if HAVE_AUDIT
-#  include <stdbool.h>
-
-#  include "libaudit-util.h"
-#  include "capability-util.h"
+#include "capability-util.h"
+#include "libaudit-util.h"
 
 static bool initialized = false;
 static int audit_fd = -EBADF;
-#endif
 
 int get_core_audit_fd(void) {
-#if HAVE_AUDIT
         if (!initialized) {
                 if (have_effective_cap(CAP_AUDIT_WRITE) <= 0)
                         audit_fd = -EPERM;
@@ -26,15 +20,10 @@ int get_core_audit_fd(void) {
         }
 
         return audit_fd;
-#else
-        return -EAFNOSUPPORT;
-#endif
 }
 
 void close_core_audit_fd(void) {
-#if HAVE_AUDIT
         close_audit_fd(audit_fd);
         initialized = true;
         audit_fd = -ECONNRESET;
-#endif
 }
diff --git a/src/core/manager.c b/src/core/manager.c
index 1e264a361d7..5b3d41596bb 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -12,10 +12,6 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#if HAVE_AUDIT
-#include <libaudit.h>
-#endif
-
 #include "sd-daemon.h"
 #include "sd-messages.h"
 #include "sd-path.h"
@@ -58,6 +54,7 @@
 #include "io-util.h"
 #include "iovec-util.h"
 #include "label-util.h"
+#include "libaudit-util.h"
 #include "load-fragment.h"
 #include "locale-setup.h"
 #include "log.h"
diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c
index 8ab488390cb..189bded2800 100644
--- a/src/core/selinux-access.c
+++ b/src/core/selinux-access.c
@@ -7,9 +7,6 @@
 #include <errno.h>
 #include <selinux/avc.h>
 #include <selinux/selinux.h>
-#if HAVE_AUDIT
-#include <libaudit.h>
-#endif
 
 #include "sd-bus.h"
 
@@ -18,6 +15,7 @@
 #include "bus-util.h"
 #include "errno-util.h"
 #include "format-util.h"
+#include "libaudit-util.h"
 #include "log.h"
 #include "path-util.h"
 #include "selinux-util.h"
diff --git a/src/shared/libaudit-util.c b/src/shared/libaudit-util.c
index e84684e581e..da85c84d203 100644
--- a/src/shared/libaudit-util.c
+++ b/src/shared/libaudit-util.c
@@ -6,10 +6,6 @@
 #include <stdio.h>
 #include <sys/socket.h>
 
-#if HAVE_AUDIT
-#  include <libaudit.h>
-#endif
-
 #include "fd-util.h"
 #include "iovec-util.h"
 #include "libaudit-util.h"
@@ -100,14 +96,15 @@ int close_audit_fd(int fd) {
 }
 
 int open_audit_fd_or_warn(void) {
-        int fd = -EBADF;
-
 #if HAVE_AUDIT
         /* If the kernel lacks netlink or audit support, don't worry about it. */
-        fd = audit_open();
+        int fd = audit_open();
         if (fd < 0)
                 return log_full_errno(ERRNO_IS_NOT_SUPPORTED(errno) ? LOG_DEBUG : LOG_WARNING,
                                       errno, "Failed to connect to audit log, ignoring: %m");
-#endif
+
         return fd;
+#else
+        return log_debug_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), "libaudit support not compiled in");
+#endif
 }
diff --git a/src/shared/libaudit-util.h b/src/shared/libaudit-util.h
index f00d816f78e..1887e180c22 100644
--- a/src/shared/libaudit-util.h
+++ b/src/shared/libaudit-util.h
@@ -1,6 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#if HAVE_AUDIT
+#  include <libaudit.h>
+#endif
+
 #include <stdbool.h>
 
 bool use_audit(void);
diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index c9d3870111e..658bc72d85a 100644
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -4,10 +4,6 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 
-#if HAVE_AUDIT
-#  include <libaudit.h>
-#endif
-
 #include "alloc-util.h"
 #include "build.h"
 #include "chase.h"
diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c
index 8c7a83ccb62..914c5ea3223 100644
--- a/src/update-utmp/update-utmp.c
+++ b/src/update-utmp/update-utmp.c
@@ -2,10 +2,6 @@
 
 #include <sys/stat.h>
 
-#if HAVE_AUDIT
-#  include <libaudit.h>
-#endif
-
 #include "sd-bus.h"
 
 #include "alloc-util.h"