daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
803fb7
From d5e8f58887c572e3d9317b68999ca5d6320f2815 Mon Sep 17 00:00:00 2001
803fb7
From: Lukas Nykryn <lnykryn@redhat.com>
803fb7
Date: Wed, 15 Jul 2015 14:52:04 +0200
803fb7
Subject: [PATCH] Revert "journald-audit: exit gracefully in the case we can't
803fb7
 join audit multicast group"
803fb7
803fb7
This reverts commit 9b5e05005e534fc7fb6dc56c94e3296bb17fe122.
803fb7
803fb7
Cherry-picked from:
803fb7
Resolves: #1222517
803fb7
---
803fb7
 src/journal/journald-audit.c | 6 ++----
803fb7
 1 file changed, 2 insertions(+), 4 deletions(-)
803fb7
803fb7
diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c
803fb7
index 77abe2e63..46eb82fa3 100644
803fb7
--- a/src/journal/journald-audit.c
803fb7
+++ b/src/journal/journald-audit.c
803fb7
@@ -533,10 +533,8 @@ int server_open_audit(Server *s) {
803fb7
                 }
803fb7
 
803fb7
                 r = bind(s->audit_fd, &sa.sa, sizeof(sa.nl));
803fb7
-                if (r < 0) {
803fb7
-                        log_warning_errno(errno, "Failed to join audit multicast group, ignoring: %m");
803fb7
-                        return 0;
803fb7
-                }
803fb7
+                if (r < 0)
803fb7
+                        return log_error_errno(errno, "Failed to join audit multicast group: %m");
803fb7
         } else
803fb7
                 fd_nonblock(s->audit_fd, 1);
803fb7