X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Faudit-fd.c;h=5a18e263a85e80fde448fe4b6ce34a5d63869a73;hp=0a8626fbc29462b83c124a148016050dfe232c10;hb=615938651d3a4fd9253b08da00db22d451a8cef8;hpb=c1165f822cd9f8c3467b5f825ce933ab8374b361
diff --git a/src/core/audit-fd.c b/src/core/audit-fd.c
index 0a8626fbc..5a18e263a 100644
--- a/src/core/audit-fd.c
+++ b/src/core/audit-fd.c
@@ -19,16 +19,18 @@
along with systemd; If not, see .
***/
-#include
-#include
+#include
#include "audit-fd.h"
-#include "log.h"
#ifdef HAVE_AUDIT
+#include
#include
+#include "log.h"
+#include "util.h"
+
static bool initialized = false;
static int audit_fd;
@@ -39,7 +41,7 @@ int get_audit_fd(void) {
if (audit_fd < 0) {
if (errno != EAFNOSUPPORT && errno != EPROTONOSUPPORT)
- log_error("Failed to connect to audit log: %m");
+ log_error_errno(errno, "Failed to connect to audit log: %m");
audit_fd = errno ? -errno : -EINVAL;
}
@@ -53,7 +55,7 @@ int get_audit_fd(void) {
void close_audit_fd(void) {
if (initialized && audit_fd >= 0)
- close_nointr_nofail(audit_fd);
+ safe_close(audit_fd);
initialized = true;
audit_fd = -ECONNRESET;